Menu
▾
▴
[Astlinux-commits] SF.net SVN: astlinux: [1022] trunk/package
|
From: <kr...@us...> - 2007-05-08 14:21:45
|
Revision: 1022
http://svn.sourceforge.net/astlinux/?rev=1022&view=rev
Author: krisk84
Date: 2007-05-08 07:21:45 -0700 (Tue, 08 May 2007)
Log Message:
-----------
merge php5, delete php4
Modified Paths:
--------------
trunk/package/Config.in
Added Paths:
-----------
trunk/package/php5/
trunk/package/php5/Config.in
trunk/package/php5/php5.mk
Removed Paths:
-------------
trunk/package/php4/
trunk/package/php5/Config.in
trunk/package/php5/php5.mk
Modified: trunk/package/Config.in
===================================================================
--- trunk/package/Config.in 2007-05-07 20:02:04 UTC (rev 1021)
+++ trunk/package/Config.in 2007-05-08 14:21:45 UTC (rev 1022)
@@ -138,7 +138,7 @@
source "package/openvpn/Config.in"
source "package/pciutils/Config.in"
source "package/pcmcia/Config.in"
-source "package/php4/Config.in"
+source "package/php5/Config.in"
source "package/pika_aob/Config.in"
source "package/portage/Config.in"
source "package/portmap/Config.in"
Copied: trunk/package/php5 (from rev 1018, branches/asterisk-beta/package/php5)
Deleted: trunk/package/php5/Config.in
===================================================================
--- branches/asterisk-beta/package/php5/Config.in 2007-05-06 03:44:36 UTC (rev 1018)
+++ trunk/package/php5/Config.in 2007-05-08 14:21:45 UTC (rev 1022)
@@ -1,7 +0,0 @@
-config BR2_PACKAGE_PHP5
- bool "php5"
- default n
- help
- This adds php5 support.
-
- http://www.php.net
Copied: trunk/package/php5/Config.in (from rev 1018, branches/asterisk-beta/package/php5/Config.in)
===================================================================
--- trunk/package/php5/Config.in (rev 0)
+++ trunk/package/php5/Config.in 2007-05-08 14:21:45 UTC (rev 1022)
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_PHP5
+ bool "php5"
+ default n
+ help
+ This adds php5 support.
+
+ http://www.php.net
Deleted: trunk/package/php5/php5.mk
===================================================================
--- branches/asterisk-beta/package/php5/php5.mk 2007-05-06 03:44:36 UTC (rev 1018)
+++ trunk/package/php5/php5.mk 2007-05-08 14:21:45 UTC (rev 1022)
@@ -1,66 +0,0 @@
-#############################################################
-#
-# php5
-#
-#############################################################
-PHP5_VERSION:=5.2.2
-PHP5_SOURCE:=php-$(PHP5_VERSION).tar.bz2
-PHP5_SITE:=http://www.php.net/distributions
-PHP5_DIR:=$(BUILD_DIR)/php-$(PHP5_VERSION)
-PHP5_BINARY:=sapi/cgi/php
-PHP5_TARGET_BINARY:=usr/bin/php
-
-$(DL_DIR)/$(PHP5_SOURCE):
- $(WGET) -P $(DL_DIR) $(PHP5_SITE)/$(PHP5_SOURCE)
-
-$(PHP5_DIR)/.source: $(DL_DIR)/$(PHP5_SOURCE)
- bzcat $(DL_DIR)/$(PHP5_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- toolchain/patch-kernel.sh $(PHP5_DIR) package/php5/ php\*.patch
- touch $(PHP5_DIR)/.source
-
-$(PHP5_DIR)/.configured: $(PHP5_DIR)/.source
- (cd $(PHP5_DIR); \
- $(TARGET_CONFIGURE_OPTS) \
- CFLAGS="$(TARGET_CFLAGS)" \
- ac_cv_path_PROG_SENDMAIL="/usr/sbin/sendmail" \
- ./configure \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --prefix=/usr \
- --sysconfdir=/etc \
- --without-iconv --without-pear --without-gd --disable-simplexml \
- --disable-bcmath --disable-libxml --disable-dom --disable-xml \
- --disable-xmlreader --disable-xmlwriter --without-sqlite \
- --without-pdo-sqlite --disable-ipv6 \
- );
- touch $(PHP5_DIR)/.configured;
-
-$(PHP5_DIR)/$(PHP5_BINARY): $(PHP5_DIR)/.configured
- $(MAKE) CC=$(TARGET_CC) -C $(PHP5_DIR)
-
-$(TARGET_DIR)/$(PHP5_TARGET_BINARY): $(PHP5_DIR)/$(PHP5_BINARY)
- $(MAKE) prefix=$(STAGING_DIR)/usr -C $(PHP5_DIR) install
- $(INSTALL) -D -m 0755 $(PHP5_DIR)/$(PHP5_BINARY) $(TARGET_DIR)/$(PHP5_TARGET_BINARY)
- $(STRIP) $(TARGET_DIR)/$(PHP5_TARGET_BINARY)
-
-php5: uclibc ncurses $(TARGET_DIR)/$(PHP5_TARGET_BINARY)
-
-php5-source: $(DL_DIR)/$(PHP5_SOURCE)
-
-php5-clean:
- # $(MAKE) prefix=$(TARGET_DIR)/usr -C $(PHP5_DIR) uninstall
- rm -Rf $(TARGET_DIR)/$(PHP5_TARGET_BINARY)
- -$(MAKE) -C $(PHP5_DIR) clean
-
-php5-dirclean:
- rm -rf $(PHP5_DIR)
-
-############################################################
-
-#Toplevel Makefile options
-
-############################################################
-ifeq ($(strip $(BR2_PACKAGE_PHP5)),y)
-TARGETS+=php5
-endif
Copied: trunk/package/php5/php5.mk (from rev 1018, branches/asterisk-beta/package/php5/php5.mk)
===================================================================
--- trunk/package/php5/php5.mk (rev 0)
+++ trunk/package/php5/php5.mk 2007-05-08 14:21:45 UTC (rev 1022)
@@ -0,0 +1,66 @@
+#############################################################
+#
+# php5
+#
+#############################################################
+PHP5_VERSION:=5.2.2
+PHP5_SOURCE:=php-$(PHP5_VERSION).tar.bz2
+PHP5_SITE:=http://www.php.net/distributions
+PHP5_DIR:=$(BUILD_DIR)/php-$(PHP5_VERSION)
+PHP5_BINARY:=sapi/cgi/php
+PHP5_TARGET_BINARY:=usr/bin/php
+
+$(DL_DIR)/$(PHP5_SOURCE):
+ $(WGET) -P $(DL_DIR) $(PHP5_SITE)/$(PHP5_SOURCE)
+
+$(PHP5_DIR)/.source: $(DL_DIR)/$(PHP5_SOURCE)
+ bzcat $(DL_DIR)/$(PHP5_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ toolchain/patch-kernel.sh $(PHP5_DIR) package/php5/ php\*.patch
+ touch $(PHP5_DIR)/.source
+
+$(PHP5_DIR)/.configured: $(PHP5_DIR)/.source
+ (cd $(PHP5_DIR); \
+ $(TARGET_CONFIGURE_OPTS) \
+ CFLAGS="$(TARGET_CFLAGS)" \
+ ac_cv_path_PROG_SENDMAIL="/usr/sbin/sendmail" \
+ ./configure \
+ --target=$(GNU_TARGET_NAME) \
+ --host=$(GNU_TARGET_NAME) \
+ --build=$(GNU_HOST_NAME) \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --without-iconv --without-pear --without-gd --disable-simplexml \
+ --disable-bcmath --disable-libxml --disable-dom --disable-xml \
+ --disable-xmlreader --disable-xmlwriter --without-sqlite \
+ --without-pdo-sqlite --disable-ipv6 \
+ );
+ touch $(PHP5_DIR)/.configured;
+
+$(PHP5_DIR)/$(PHP5_BINARY): $(PHP5_DIR)/.configured
+ $(MAKE) CC=$(TARGET_CC) -C $(PHP5_DIR)
+
+$(TARGET_DIR)/$(PHP5_TARGET_BINARY): $(PHP5_DIR)/$(PHP5_BINARY)
+ $(MAKE) prefix=$(STAGING_DIR)/usr -C $(PHP5_DIR) install
+ $(INSTALL) -D -m 0755 $(PHP5_DIR)/$(PHP5_BINARY) $(TARGET_DIR)/$(PHP5_TARGET_BINARY)
+ $(STRIP) $(TARGET_DIR)/$(PHP5_TARGET_BINARY)
+
+php5: uclibc ncurses $(TARGET_DIR)/$(PHP5_TARGET_BINARY)
+
+php5-source: $(DL_DIR)/$(PHP5_SOURCE)
+
+php5-clean:
+ # $(MAKE) prefix=$(TARGET_DIR)/usr -C $(PHP5_DIR) uninstall
+ rm -Rf $(TARGET_DIR)/$(PHP5_TARGET_BINARY)
+ -$(MAKE) -C $(PHP5_DIR) clean
+
+php5-dirclean:
+ rm -rf $(PHP5_DIR)
+
+############################################################
+
+#Toplevel Makefile options
+
+############################################################
+ifeq ($(strip $(BR2_PACKAGE_PHP5)),y)
+TARGETS+=php5
+endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
