* [Buildroot] svn commit: trunk/buildroot/package/php
@ 2009-03-04 20:58 jacmet at uclibc.org
0 siblings, 0 replies; 21+ messages in thread
From: jacmet at uclibc.org @ 2009-03-04 20:58 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2009-03-04 20:58:08 +0000 (Wed, 04 Mar 2009)
New Revision: 25531
Log:
php: convert to Makefile.autotools.in and other improvements
Patch by Gustavo Zacarias <gustavo@zacarias.com.ar>
Closes #5, #77, #141 and #143.
* Migrate php package to Makefile.autotools.in
* Make PCRE regex an option (previously forced on)
* Add calendar option from bug #77
* Add external sqlite3 option from bug #141
New option BR2_PACKAGE_PHP_PDO_SQLITE_EXTERNAL
* Add alternate php.ini configuration option from bug #5
Named BR2_PACKAGE_PHP_CONFIG and defaults to shipped config.
In most scenarios the shipped config isn't good enough, it has
a high memory limit for embedded for example.
* Changed some options from depends to select
Namely openssl, libxml2, zlib, gettext, gmp.
* Disabled some 'y' defaults to make things lighter by default
Namely libxml2, sqlite, pdo and pdo_sqlite.
* Made some of the extensions help text more verbose
Modified:
trunk/buildroot/package/php/Config.ext
trunk/buildroot/package/php/php.mk
Changeset:
Modified: trunk/buildroot/package/php/Config.ext
===================================================================
--- trunk/buildroot/package/php/Config.ext 2009-03-04 20:16:26 UTC (rev 25530)
+++ trunk/buildroot/package/php/Config.ext 2009-03-04 20:58:08 UTC (rev 25531)
@@ -1,5 +1,12 @@
menu "PHP Extensions"
+config BR2_PACKAGE_PHP_CONFIG
+ string "PHP configuration file to use"
+ default "$(PHP_DIR)/php.ini-dist"
+ help
+ If you want to use a different php.ini file define it here.
+ Otherwise it'll just copy the default php.ini-dist from PHP.
+
config BR2_PACKAGE_PHP_EXT_SOCKETS
bool "socket"
help
@@ -15,7 +22,7 @@
bool "SPL"
default y
help
- SPL support
+ Standard PHP library support
config BR2_PACKAGE_PHP_EXT_SESSION
bool "Session"
@@ -25,16 +32,15 @@
config BR2_PACKAGE_PHP_EXT_OPENSSL
bool "openssl"
- depends on BR2_PACKAGE_OPENSSL
+ select BR2_PACKAGE_OPENSSL
help
openssl support
config BR2_PACKAGE_PHP_EXT_LIBXML2
bool "xml2"
- depends on BR2_PACKAGE_LIBXML2
- default y
+ select BR2_PACKAGE_LIBXML2
help
- xml support
+ libxml2 support
config BR2_PACKAGE_PHP_EXT_SIMPLEXML
bool "simplexml"
@@ -44,7 +50,7 @@
config BR2_PACKAGE_PHP_EXT_ZLIB
bool "zlib"
- depends on BR2_PACKAGE_ZLIB
+ select BR2_PACKAGE_ZLIB
default y
help
zlib support
@@ -61,20 +67,20 @@
config BR2_PACKAGE_PHP_EXT_GETTEXT
bool "gettext"
- depends on BR2_PACKAGE_GETTEXT
+ select BR2_PACKAGE_GETTEXT
help
gettext support
config BR2_PACKAGE_PHP_EXT_GMP
bool "gmp"
- depends on BR2_PACKAGE_LIBGMP
+ select BR2_PACKAGE_LIBGMP
help
GMP support
config BR2_PACKAGE_PHP_EXT_JSON
bool "JSON"
help
- JSON support
+ JavaScript Object Serialization support
config BR2_PACKAGE_PHP_EXT_READLINE
bool "readline"
@@ -88,6 +94,11 @@
help
ncurses support
+config BR2_PACKAGE_PHP_EXT_PCRE
+ bool "PCRE"
+ help
+ Perl Compatible Regular Expressions support
+
config BR2_PACKAGE_PHP_EXT_SYSVMSG
bool "sysvmsg - System V Message queue"
help
@@ -106,20 +117,24 @@
config BR2_PACKAGE_PHP_EXT_ZIP
bool "zip"
help
- Zip Support
+ Zip read/write support
config BR2_PACKAGE_PHP_EXT_FILTER
bool "filter"
help
Input filter support
+config BR2_PACKAGE_PHP_EXT_CALENDAR
+ bool "calendar"
+ help
+ Calendar and event support
+
comment "Database extensions"
config BR2_PACKAGE_PHP_EXT_SQLITE
- bool "sqlite"
- default y
+ bool "SQLite"
help
- SQLite
+ Legacy SQLite2 support
config BR2_PACKAGE_PHP_EXT_SQLITE_UTF8
bool "sqlite UTF8 support"
@@ -129,22 +144,27 @@
config BR2_PACKAGE_PHP_EXT_PDO
bool "PDO"
- default y
help
- PDO support
+ PHP Data Objects support
config BR2_PACKAGE_PHP_EXT_PDO_SQLITE
bool "PDO_SQLite"
depends on BR2_PACKAGE_PHP_EXT_PDO
- default y
help
- SQLite support for PDO
+ SQLite driver for PDO
+config BR2_PACKAGE_PHP_EXT_PDO_SQLITE_EXTERNAL
+ bool "PDO_SQLite external"
+ depends on BR2_PACKAGE_PHP_EXT_PDO_SQLITE
+ select BR2_PACKAGE_SQLITE
+ help
+ Use external sqlite3 library
+
config BR2_PACKAGE_PHP_EXT_PDO_MYSQL
bool "PDO_MySQL"
depends on BR2_PACKAGE_PHP_EXT_PDO
select BR2_PACKAGE_MYSQL_CLIENT
help
- MySQL support for PDO
+ PDO driver for MySQL
endmenu
Modified: trunk/buildroot/package/php/php.mk
===================================================================
--- trunk/buildroot/package/php/php.mk 2009-03-04 20:16:26 UTC (rev 25530)
+++ trunk/buildroot/package/php/php.mk 2009-03-04 20:58:08 UTC (rev 25531)
@@ -3,209 +3,181 @@
# php
#
#############################################################
-PHP_VER:=5.2.9
-PHP_SOURCE:=php-$(PHP_VER).tar.bz2
-PHP_SITE:=http://www.php.net/distributions
-PHP_DIR:=$(BUILD_DIR)/php-$(PHP_VER)
-PHP_CAT=$(BZCAT)
-PHP_DEPS=
-PHP_TARGET_DEPS=
-PHP_CONFIGURE = $(ENABLE_DEBUG)
+PHP_VERSION = 5.2.9
+PHP_SOURCE = php-$(PHP_VERSION).tar.bz2
+PHP_SITE = http://www.php.net/distributions
+PHP_INSTALL_STAGING = YES
+PHP_INSTALL_STAGING_OPT = INSTALL_ROOT=$(STAGING_DIR) install
+PHP_INSTALL_TARGET_OPT = INSTALL_ROOT=$(TARGET_DIR) install
+PHP_LIBTOOL_PATCH = NO
+PHP_DEPENDENCIES = uclibc
+PHP_CONF_OPT = $(DISABLE_IPV6) \
+ --mandir=/usr/share/man \
+ --infodir=/usr/share/info \
+ --disable-all \
+ --without-pear \
+ --with-config-file-path=/etc \
+ --localstatedir=/var \
+
ifneq ($(BR2_PACKAGE_PHP_CLI),y)
- PHP_CONFIGURE+=--disable-cli
+ PHP_CONF_OPT += --disable-cli
else
- PHP_CONFIGURE+=--enable-cli
- PHP_TARGET_DEPS+=$(TARGET_DIR)/usr/bin/php
+ PHP_CONF_OPT += --enable-cli
endif
ifneq ($(BR2_PACKAGE_PHP_CGI),y)
- PHP_CONFIGURE+=--disable-cgi
+ PHP_CONF_OPT += --disable-cgi
else
- PHP_CONFIGURE=--enable-cgi
- PHP_TARGET_DEPS+=$(TARGET_DIR)/usr/bin/php-cgi
+ PHP_CONF_OPT += --enable-cgi
ifeq ($(BR2_PACKAGE_PHP_FASTCGI),y)
- PHP_CONFIGURE+=--enable-fastcgi
+ PHP_CONF_OPT += --enable-fastcgi
endif
endif
-ifneq ($(BR2_INET_IPV6),y)
- PHP_CONFIGURE+=--disable-ipv6
-endif
-
### Extensions
ifeq ($(BR2_PACKAGE_PHP_EXT_SOCKETS),y)
- PHP_CONFIGURE+=--enable-sockets
+ PHP_CONF_OPT += --enable-sockets
endif
+
ifeq ($(BR2_PACKAGE_PHP_EXT_POSIX),y)
- PHP_CONFIGURE+=--enable-posix
+ PHP_CONF_OPT += --enable-posix
endif
+
ifeq ($(BR2_PACKAGE_PHP_EXT_SPL),y)
- PHP_CONFIGURE+=--enable-spl
+ PHP_CONF_OPT += --enable-spl
endif
+
ifeq ($(BR2_PACKAGE_PHP_EXT_SESSION),y)
- PHP_CONFIGURE+=--enable-session
+ PHP_CONF_OPT += --enable-session
endif
+
ifeq ($(BR2_PACKAGE_PHP_EXT_OPENSSL),y)
- PHP_CONFIGURE+=--with-openssl=$(STAGING_DIR)/usr
- PHP_DEPS+=openssl
+ PHP_CONF_OPT += --with-openssl=$(STAGING_DIR)/usr
+ PHP_DEPENDENCIES += openssl
endif
+
ifeq ($(BR2_PACKAGE_PHP_EXT_LIBXML2),y)
- PHP_CONFIGURE+=--enable-libxml \
+ PHP_CONF_OPT += --enable-libxml \
--with-libxml-dir=${STAGING_DIR}/usr \
--enable-xml \
--enable-xmlreader \
--enable-xmlwriter
- PHP_DEPS+=libxml2
+ PHP_DEPENDENCIES += libxml2
endif
+
ifeq ($(BR2_PACKAGE_PHP_EXT_SIMPLEXML),y)
- PHP_CONFIGURE+=--enable-simplexml
+ PHP_CONF_OPT += --enable-simplexml
endif
+
ifeq ($(BR2_PACKAGE_PHP_EXT_ZLIB),y)
- PHP_CONFIGURE+=--with-zlib=$(STAGING_DIR)/usr
- PHP_DEPS+=zlib
+ PHP_CONF_OPT += --with-zlib=$(STAGING_DIR)/usr
+ PHP_DEPENDENCIES += zlib
endif
+
ifeq ($(BR2_PACKAGE_PHP_EXT_EXIF),y)
- PHP_CONFIGURE+=--enable-exif
+ PHP_CONF_OPT += --enable-exif
endif
+
ifeq ($(BR2_PACKAGE_PHP_EXT_FTP),y)
- PHP_CONFIGURE+=--enable-ftp
+ PHP_CONF_OPT += --enable-ftp
endif
+
ifeq ($(BR2_PACKAGE_PHP_EXT_GETTEXT),y)
- PHP_CONFIGURE+=--with-gettext=$(STAGING_DIR)/usr
- PHP_DEPS+=gettext
+ PHP_CONF_OPT += --with-gettext=$(STAGING_DIR)/usr
+ PHP_DEPENDENCIES += gettext
endif
+
ifeq ($(BR2_PACKAGE_PHP_EXT_GMP),y)
- PHP_CONFIGURE+=--with-gmp=$(STAGING_DIR)/usr
- PHP_DEPS+=libgmp
+ PHP_CONF_OPT += --with-gmp=$(STAGING_DIR)/usr
+ PHP_DEPENDENCIES += libgmp
endif
+
ifeq ($(BR2_PACKAGE_PHP_EXT_JSON),y)
- PHP_CONFIGURE+=--enable-json
+ PHP_CONF_OPT += --enable-json
endif
+
ifeq ($(BR2_PACKAGE_PHP_EXT_READLINE),y)
- PHP_CONFIGURE+=--with-readline=$(STAGING_DIR)/usr
- PHP_DEPS+=readline
+ PHP_CONF_OPT += --with-readline=$(STAGING_DIR)/usr
+ PHP_DEPENDENCIES += readline
endif
+
ifeq ($(BR2_PACKAGE_PHP_EXT_NCURSES),y)
- PHP_CONFIGURE+=--with-ncurses=$(STAGING_DIR)/usr
- PHP_DEPS+=ncurses
+ PHP_CONF_OPT += --with-ncurses=$(STAGING_DIR)/usr
+ PHP_DEPENDENCIES += ncurses
endif
+
ifeq ($(BR2_PACKAGE_PHP_EXT_SYSVMSG),y)
- PHP_CONFIGURE+=--enable-sysvmsg
+ PHP_CONF_OPT += --enable-sysvmsg
endif
+
ifeq ($(BR2_PACKAGE_PHP_EXT_SYSVSEM),y)
- PHP_CONFIGURE+=--enable-sysvsem
+ PHP_CONF_OPT += --enable-sysvsem
endif
+
ifeq ($(BR2_PACKAGE_PHP_EXT_SYSVSHM),y)
- PHP_CONFIGURE+=--enable-sysvshm
+ PHP_CONF_OPT += --enable-sysvshm
endif
+
ifeq ($(BR2_PACKAGE_PHP_EXT_ZIP),y)
- PHP_CONFIGURE+=--enable-zip
+ PHP_CONF_OPT += --enable-zip
endif
+
ifeq ($(BR2_PACKAGE_PHP_EXT_FILTER),y)
- PHP_CONFIGURE+=--enable-filter
+ PHP_CONF_OPT += --enable-filter
endif
-### Database extensions
+ifeq ($(BR2_PACKAGE_PHP_EXT_CALENDAR),y)
+ PHP_CONF_OPT += --enable-calendar
+endif
+
+ifeq ($(BR2_PACKAGE_PHP_EXT_PCRE),y)
+ PHP_CONF_OPT += --with-pcre-regex
+endif
+
+### Legacy sqlite2 support
ifeq ($(BR2_PACKAGE_PHP_EXT_SQLITE),y)
- PHP_CONFIGURE+=--with-sqlite
+ PHP_CONF_OPT += --with-sqlite
ifneq ($(BR2_LARGEFILE),y)
- PHP_CFLAGS+= -DSQLITE_DISABLE_LFS
+ PHP_CONF_ENV += CFLAGS+=" -DSQLITE_DISABLE_LFS"
endif
ifeq ($(BR2_PACKAGE_PHP_EXT_SQLITE_UTF8),y)
- PHP_CONFIGURE+=--enable-sqlite-utf8
+ PHP_CONF_OPT += --enable-sqlite-utf8
endif
endif
+
+### PDO
ifeq ($(BR2_PACKAGE_PHP_EXT_PDO),y)
- PHP_CONFIGURE+=--enable-pdo
+ PHP_CONF_OPT += --enable-pdo
ifeq ($(BR2_PACKAGE_PHP_EXT_PDO_SQLITE),y)
- PHP_CONFIGURE+=--with-pdo-sqlite
- PHP_CFLAGS+= -DSQLITE_OMIT_LOAD_EXTENSION
+ifeq ($(BR2_PACKAGE_PHP_EXT_PDO_SQLITE_EXTERNAL),y)
+ PHP_CONF_OPT += --with-pdo-sqlite=$(STAGING_DIR)/usr
+else
+ PHP_CONF_OPT += --with-pdo-sqlite
endif
+ PHP_CONF_ENV += CFLAGS+=" -DSQLITE_OMIT_LOAD_EXTENSION"
+endif
ifeq ($(BR2_PACKAGE_PHP_EXT_PDO_MYSQL),y)
- PHP_CONFIGURE+=--with-pdo-mysql=$(STAGING_DIR)/usr
- PHP_DEPS+=mysql_client
+ PHP_CONF_OPT += --with-pdo-mysql=$(STAGING_DIR)/usr
+ PHP_DEPENDENCIES += mysql_client
endif
endif
-$(DL_DIR)/$(PHP_SOURCE):
- $(call DOWNLOAD,$(PHP_SITE),$(PHP_SOURCE))
+$(eval $(call AUTOTARGETS,package,php))
-php-source: $(DL_DIR)/$(PHP_SOURCE)
+$(PHP_HOOK_POST_INSTALL):
+ rm -rf $(TARGET_DIR)/usr/lib/php
+ rm -f $(TARGET_DIR)/usr/bin/phpize
+ rm -f $(TARGET_DIR)/usr/bin/php-config
+ $(INSTALL) -m 0755 $(BR2_PACKAGE_PHP_CONFIG) $(TARGET_DIR)/etc/php.ini
-$(PHP_DIR)/.unpacked: $(DL_DIR)/$(PHP_SOURCE)
- $(PHP_CAT) $(DL_DIR)/$(PHP_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- toolchain/patch-kernel.sh $(PHP_DIR) package/php/ php\*.patch
- toolchain/patch-kernel.sh $(PHP_DIR) package/php/ php\*.patch.$(ARCH)
- touch $@
-
-$(PHP_DIR)/.configured: $(PHP_DIR)/.unpacked
- (cd $(PHP_DIR); rm -rf config.cache; \
- $(TARGET_CONFIGURE_OPTS) \
- $(TARGET_CONFIGURE_ARGS) \
- CC=$(TARGET_CC) \
- ./configure \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --prefix=/usr \
- --exec-prefix=/ \
- --bindir=/usr/bin \
- --sbindir=/usr/sbin \
- --libexecdir=/usr/lib \
- --sysconfdir=/etc \
- --with-config-file-path=/etc \
- --datadir=/usr/share/misc \
- --localstatedir=/var \
- --mandir=/usr/man \
- --infodir=/usr/info \
- --disable-all \
- --with-pcre-regex \
- --without-pear \
- $(PHP_CONFIGURE) \
- )
- touch $@
-
-$(PHP_DIR)/.built: $(PHP_DIR)/.configured
- $(MAKE) CC="$(TARGET_CC) $(PHP_CFLAGS)" -C $(PHP_DIR)
- touch $@
-
-$(PHP_DIR)/.staged: $(PHP_DIR)/.built
- $(MAKE) DESTDIR=$(STAGING_DIR) INSTALL_ROOT=$(STAGING_DIR) CC=$(TARGET_CC) -C $(PHP_DIR) install
- touch $@
-
-$(TARGET_DIR)/usr/bin/php: $(PHP_DIR)/.staged
- cp -dpf $(STAGING_DIR)/usr/bin/php $(TARGET_DIR)/usr/bin/php
- chmod 755 $(TARGET_DIR)/usr/bin/php
- $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/php
-
-$(TARGET_DIR)/usr/bin/php-cgi: $(PHP_DIR)/.staged
- cp -dpf $(STAGING_DIR)/usr/bin/php-cgi $(TARGET_DIR)/usr/bin/php-cgi
- chmod 755 $(TARGET_DIR)/usr/bin/php-cgi
- $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/php-cgi
-
-$(TARGET_DIR)/etc/php.ini: $(PHP_DIR)/.staged
- cp -f $(PHP_DIR)/php.ini-dist $(TARGET_DIR)/etc/php.ini
-
-php: uclibc $(PHP_DEPS) $(PHP_TARGET_DEPS) $(TARGET_DIR)/etc/php.ini
-
-php-unpacked: $(PHP_DIR)/.unpacked
-
-php-clean:
- rm -f $(PHP_DIR)/.configured $(PHP_DIR)/.built $(PHP_DIR)/.staged
- rm -f $(PHP_TARGET_DEPS)
- rm -f $(STAGING_DIR)/usr/bin/php* $(STAGING_DIR)/usr/man/man1/php*
+$(PHP_TARGET_UNINSTALL):
+ $(call MESSAGE,"Uninstalling")
rm -rf $(STAGING_DIR)/usr/include/php
- -$(MAKE) -C $(PHP_DIR) clean
+ rm -rf $(STAGING_DIR)/usr/lib/php
+ rm -f $(STAGING_DIR)/usr/bin/php*
+ rm -f $(STAGING_DIR)/usr/share/man/man1/php*.1
+ rm -f $(TARGET_DIR)/etc/php.ini
+ rm -f $(TARGET_DIR)/usr/bin/php*
+ rm -f $(PHP_TARGET_INSTALL_TARGET) $(PHP_HOOK_POST_INSTALL)
-php-dirclean:
- rm -rf $(PHP_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_PHP),y)
-TARGETS+=php
-endif
^ permalink raw reply [flat|nested] 21+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/php
@ 2009-03-04 20:58 jacmet at uclibc.org
0 siblings, 0 replies; 21+ messages in thread
From: jacmet at uclibc.org @ 2009-03-04 20:58 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2009-03-04 20:58:12 +0000 (Wed, 04 Mar 2009)
New Revision: 25532
Log:
php: only overwrite php.ini if not present in target_skeleton
Allow platforms to provide a custom php.ini in their target_skeleton.
Modified:
trunk/buildroot/package/php/php.mk
Changeset:
Modified: trunk/buildroot/package/php/php.mk
===================================================================
--- trunk/buildroot/package/php/php.mk 2009-03-04 20:58:08 UTC (rev 25531)
+++ trunk/buildroot/package/php/php.mk 2009-03-04 20:58:12 UTC (rev 25532)
@@ -169,7 +169,8 @@
rm -rf $(TARGET_DIR)/usr/lib/php
rm -f $(TARGET_DIR)/usr/bin/phpize
rm -f $(TARGET_DIR)/usr/bin/php-config
- $(INSTALL) -m 0755 $(BR2_PACKAGE_PHP_CONFIG) $(TARGET_DIR)/etc/php.ini
+ if [ ! -f $(TARGET_DIR)/etc/php.ini ]; then \
+ $(INSTALL) -m 0755 $(BR2_PACKAGE_PHP_CONFIG) $(TARGET_DIR)/etc/php.ini; fi
$(PHP_TARGET_UNINSTALL):
$(call MESSAGE,"Uninstalling")
^ permalink raw reply [flat|nested] 21+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/php
@ 2009-03-02 19:05 jacmet at uclibc.org
0 siblings, 0 replies; 21+ messages in thread
From: jacmet at uclibc.org @ 2009-03-02 19:05 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2009-03-02 19:05:33 +0000 (Mon, 02 Mar 2009)
New Revision: 25489
Log:
php: bump version
Fixes Fixes CVE-2008-5498, closes #137.
Patch by Gustavo Zacarias <gustavo@zacarias.com.ar>
Modified:
trunk/buildroot/package/php/php.mk
Changeset:
Modified: trunk/buildroot/package/php/php.mk
===================================================================
--- trunk/buildroot/package/php/php.mk 2009-03-02 16:12:00 UTC (rev 25488)
+++ trunk/buildroot/package/php/php.mk 2009-03-02 19:05:33 UTC (rev 25489)
@@ -3,7 +3,7 @@
# php
#
#############################################################
-PHP_VER:=5.2.8
+PHP_VER:=5.2.9
PHP_SOURCE:=php-$(PHP_VER).tar.bz2
PHP_SITE:=http://www.php.net/distributions
PHP_DIR:=$(BUILD_DIR)/php-$(PHP_VER)
@@ -144,7 +144,7 @@
$(TARGET_CONFIGURE_OPTS) \
$(TARGET_CONFIGURE_ARGS) \
CC=$(TARGET_CC) \
- ./configure $(DISABLE_NLS) \
+ ./configure \
--target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) \
^ permalink raw reply [flat|nested] 21+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/php
@ 2009-02-25 19:51 jacmet at uclibc.org
0 siblings, 0 replies; 21+ messages in thread
From: jacmet at uclibc.org @ 2009-02-25 19:51 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2009-02-25 19:51:41 +0000 (Wed, 25 Feb 2009)
New Revision: 25455
Log:
php: Config.ext is in a BR2_PACKAGE_PHP conditional, so get rid of depends
Hunks missing from r25406.
Modified:
trunk/buildroot/package/php/Config.ext
Changeset:
Modified: trunk/buildroot/package/php/Config.ext
===================================================================
--- trunk/buildroot/package/php/Config.ext 2009-02-25 14:28:49 UTC (rev 25454)
+++ trunk/buildroot/package/php/Config.ext 2009-02-25 19:51:41 UTC (rev 25455)
@@ -51,73 +51,65 @@
config BR2_PACKAGE_PHP_EXT_EXIF
bool "EXIF"
- depends on BR2_PACKAGE_PHP
help
EXIF support
config BR2_PACKAGE_PHP_EXT_FTP
bool "FTP"
- depends on BR2_PACKAGE_PHP
help
FTP Support
config BR2_PACKAGE_PHP_EXT_GETTEXT
bool "gettext"
- depends on BR2_PACKAGE_PHP && BR2_PACKAGE_GETTEXT
+ depends on BR2_PACKAGE_GETTEXT
help
gettext support
config BR2_PACKAGE_PHP_EXT_GMP
bool "gmp"
- depends on BR2_PACKAGE_PHP && BR2_PACKAGE_LIBGMP
+ depends on BR2_PACKAGE_LIBGMP
help
GMP support
config BR2_PACKAGE_PHP_EXT_JSON
bool "JSON"
- depends on BR2_PACKAGE_PHP
help
JSON support
config BR2_PACKAGE_PHP_EXT_READLINE
bool "readline"
- depends on BR2_PACKAGE_PHP && (BR2_PACKAGE_PHP_CLI || BR2_PACKAGE_PHP_CGI) && BR2_PACKAGE_READLINE
+ depends on (BR2_PACKAGE_PHP_CLI || BR2_PACKAGE_PHP_CGI) && BR2_PACKAGE_READLINE
help
readline support
config BR2_PACKAGE_PHP_EXT_NCURSES
bool "ncurses"
- depends on BR2_PACKAGE_PHP && (BR2_PACKAGE_PHP_CLI || BR2_PACKAGE_PHP_CGI) && BR2_PACKAGE_NCURSES
+ depends on (BR2_PACKAGE_PHP_CLI || BR2_PACKAGE_PHP_CGI) && BR2_PACKAGE_NCURSES
help
ncurses support
config BR2_PACKAGE_PHP_EXT_SYSVMSG
bool "sysvmsg - System V Message queue"
- depends on BR2_PACKAGE_PHP
help
System V Message queue support
config BR2_PACKAGE_PHP_EXT_SYSVSEM
bool "sysvsem - System V Semaphores"
- depends on BR2_PACKAGE_PHP
help
System V Sempahore support
config BR2_PACKAGE_PHP_EXT_SYSVSHM
bool "sysvshm - System V Shared memory"
- depends on BR2_PACKAGE_PHP
help
System V Shared memory support
config BR2_PACKAGE_PHP_EXT_ZIP
bool "zip"
- depends on BR2_PACKAGE_PHP
help
Zip Support
config BR2_PACKAGE_PHP_EXT_FILTER
bool "filter"
- depends on BR2_PACKAGE_PHP
help
Input filter support
@@ -125,34 +117,32 @@
config BR2_PACKAGE_PHP_EXT_SQLITE
bool "sqlite"
- depends on BR2_PACKAGE_PHP
default y
help
SQLite
config BR2_PACKAGE_PHP_EXT_SQLITE_UTF8
bool "sqlite UTF8 support"
- depends on BR2_PACKAGE_PHP && BR2_PACKAGE_PHP_EXT_SQLITE
+ depends on BR2_PACKAGE_PHP_EXT_SQLITE
help
UTF8 Support for sqlite
config BR2_PACKAGE_PHP_EXT_PDO
bool "PDO"
- depends on BR2_PACKAGE_PHP
default y
help
PDO support
config BR2_PACKAGE_PHP_EXT_PDO_SQLITE
bool "PDO_SQLite"
- depends on BR2_PACKAGE_PHP && BR2_PACKAGE_PHP_EXT_PDO
+ depends on BR2_PACKAGE_PHP_EXT_PDO
default y
help
SQLite support for PDO
config BR2_PACKAGE_PHP_EXT_PDO_MYSQL
bool "PDO_MySQL"
- depends on BR2_PACKAGE_PHP && BR2_PACKAGE_PHP_EXT_PDO
+ depends on BR2_PACKAGE_PHP_EXT_PDO
select BR2_PACKAGE_MYSQL_CLIENT
help
MySQL support for PDO
^ permalink raw reply [flat|nested] 21+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/php
@ 2009-02-21 9:06 jacmet at uclibc.org
0 siblings, 0 replies; 21+ messages in thread
From: jacmet at uclibc.org @ 2009-02-21 9:06 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2009-02-21 09:06:48 +0000 (Sat, 21 Feb 2009)
New Revision: 25406
Log:
php: Config.ext is in a BR2_PACKAGE_PHP conditional, so get rid of depends
Modified:
trunk/buildroot/package/php/Config.ext
Changeset:
Modified: trunk/buildroot/package/php/Config.ext
===================================================================
--- trunk/buildroot/package/php/Config.ext 2009-02-21 09:06:43 UTC (rev 25405)
+++ trunk/buildroot/package/php/Config.ext 2009-02-21 09:06:48 UTC (rev 25406)
@@ -2,54 +2,49 @@
config BR2_PACKAGE_PHP_EXT_SOCKETS
bool "socket"
- depends on BR2_PACKAGE_PHP
help
Sockets support
config BR2_PACKAGE_PHP_EXT_POSIX
bool "posix"
- depends on BR2_PACKAGE_PHP
default y
help
POSIX support
config BR2_PACKAGE_PHP_EXT_SPL
bool "SPL"
- depends on BR2_PACKAGE_PHP
default y
help
SPL support
config BR2_PACKAGE_PHP_EXT_SESSION
bool "Session"
- depends on BR2_PACKAGE_PHP
default y
help
Session support
config BR2_PACKAGE_PHP_EXT_OPENSSL
bool "openssl"
- depends on BR2_PACKAGE_PHP && BR2_PACKAGE_OPENSSL
+ depends on BR2_PACKAGE_OPENSSL
help
openssl support
config BR2_PACKAGE_PHP_EXT_LIBXML2
bool "xml2"
- depends on BR2_PACKAGE_PHP && BR2_PACKAGE_LIBXML2
+ depends on BR2_PACKAGE_LIBXML2
default y
help
xml support
config BR2_PACKAGE_PHP_EXT_SIMPLEXML
bool "simplexml"
- depends on BR2_PACKAGE_PHP
select BR2_PACKAGE_PHP_EXT_LIBXML2
help
SimpleXML support
config BR2_PACKAGE_PHP_EXT_ZLIB
bool "zlib"
- depends on BR2_PACKAGE_PHP && BR2_PACKAGE_ZLIB
+ depends on BR2_PACKAGE_ZLIB
default y
help
zlib support
^ permalink raw reply [flat|nested] 21+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/php
@ 2009-02-21 9:06 jacmet at uclibc.org
0 siblings, 0 replies; 21+ messages in thread
From: jacmet at uclibc.org @ 2009-02-21 9:06 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2009-02-21 09:06:43 +0000 (Sat, 21 Feb 2009)
New Revision: 25405
Log:
php: fix sqlite module
- php comes with it's own embedded sqlite, so no need to select sqlite
- disable largefile support for !BR2_LARGEFILE
- php somehow forgets to link with -ldl, breaking the sqlite extension.
Fix it by disabling the (unused?) modload support in sqlite.
Modified:
trunk/buildroot/package/php/Config.ext
trunk/buildroot/package/php/php.mk
Changeset:
Modified: trunk/buildroot/package/php/Config.ext
===================================================================
--- trunk/buildroot/package/php/Config.ext 2009-02-20 21:55:32 UTC (rev 25404)
+++ trunk/buildroot/package/php/Config.ext 2009-02-21 09:06:43 UTC (rev 25405)
@@ -131,7 +131,6 @@
config BR2_PACKAGE_PHP_EXT_SQLITE
bool "sqlite"
depends on BR2_PACKAGE_PHP
- select BR2_PACKAGE_SQLITE
default y
help
SQLite
Modified: trunk/buildroot/package/php/php.mk
===================================================================
--- trunk/buildroot/package/php/php.mk 2009-02-20 21:55:32 UTC (rev 25404)
+++ trunk/buildroot/package/php/php.mk 2009-02-21 09:06:43 UTC (rev 25405)
@@ -109,7 +109,9 @@
### Database extensions
ifeq ($(BR2_PACKAGE_PHP_EXT_SQLITE),y)
PHP_CONFIGURE+=--with-sqlite
- PHP_DEPS+=sqlite
+ifneq ($(BR2_LARGEFILE),y)
+ PHP_CFLAGS+= -DSQLITE_DISABLE_LFS
+endif
ifeq ($(BR2_PACKAGE_PHP_EXT_SQLITE_UTF8),y)
PHP_CONFIGURE+=--enable-sqlite-utf8
endif
@@ -118,6 +120,7 @@
PHP_CONFIGURE+=--enable-pdo
ifeq ($(BR2_PACKAGE_PHP_EXT_PDO_SQLITE),y)
PHP_CONFIGURE+=--with-pdo-sqlite
+ PHP_CFLAGS+= -DSQLITE_OMIT_LOAD_EXTENSION
endif
ifeq ($(BR2_PACKAGE_PHP_EXT_PDO_MYSQL),y)
PHP_CONFIGURE+=--with-pdo-mysql=$(STAGING_DIR)/usr
@@ -164,7 +167,7 @@
touch $@
$(PHP_DIR)/.built: $(PHP_DIR)/.configured
- $(MAKE) CC=$(TARGET_CC) -C $(PHP_DIR)
+ $(MAKE) CC="$(TARGET_CC) $(PHP_CFLAGS)" -C $(PHP_DIR)
touch $@
$(PHP_DIR)/.staged: $(PHP_DIR)/.built
^ permalink raw reply [flat|nested] 21+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/php
@ 2009-02-20 21:55 jacmet at uclibc.org
0 siblings, 0 replies; 21+ messages in thread
From: jacmet at uclibc.org @ 2009-02-20 21:55 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2009-02-20 21:55:32 +0000 (Fri, 20 Feb 2009)
New Revision: 25404
Log:
php: use alternative download URL so we can use DOWNLOAD macro
As noted by Solar on IRC.
Modified:
trunk/buildroot/package/php/php.mk
Changeset:
Modified: trunk/buildroot/package/php/php.mk
===================================================================
--- trunk/buildroot/package/php/php.mk 2009-02-20 15:13:50 UTC (rev 25403)
+++ trunk/buildroot/package/php/php.mk 2009-02-20 21:55:32 UTC (rev 25404)
@@ -5,7 +5,7 @@
#############################################################
PHP_VER:=5.2.8
PHP_SOURCE:=php-$(PHP_VER).tar.bz2
-PHP_SITE:=http://us.php.net/get/${PHP_SOURCE}/from/us2.php.net/mirror
+PHP_SITE:=http://www.php.net/distributions
PHP_DIR:=$(BUILD_DIR)/php-$(PHP_VER)
PHP_CAT=$(BZCAT)
PHP_DEPS=
@@ -126,7 +126,7 @@
endif
$(DL_DIR)/$(PHP_SOURCE):
- $(WGET) -P $(DL_DIR) $(PHP_SITE)
+ $(call DOWNLOAD,$(PHP_SITE),$(PHP_SOURCE))
php-source: $(DL_DIR)/$(PHP_SOURCE)
^ permalink raw reply [flat|nested] 21+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/php
@ 2009-02-20 15:13 jacmet at uclibc.org
0 siblings, 0 replies; 21+ messages in thread
From: jacmet at uclibc.org @ 2009-02-20 15:13 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2009-02-20 15:13:50 +0000 (Fri, 20 Feb 2009)
New Revision: 25403
Log:
php: don't use DOWNLOAD macro
php.net only offers downloads though a strange php script with the file name
embedded in the *MIDDLE* of the URL, which isn't compatible with the DOWNLOAD
macro. Fix it by reverting php.mk hunk of r24689 to go back to $(WGET).
This ofcourse means that the primary site / fallback mirror stuff isn't used.
Modified:
trunk/buildroot/package/php/php.mk
Changeset:
Modified: trunk/buildroot/package/php/php.mk
===================================================================
--- trunk/buildroot/package/php/php.mk 2009-02-20 15:02:14 UTC (rev 25402)
+++ trunk/buildroot/package/php/php.mk 2009-02-20 15:13:50 UTC (rev 25403)
@@ -126,7 +126,7 @@
endif
$(DL_DIR)/$(PHP_SOURCE):
- $(call DOWNLOAD,$(PHP_SITE))
+ $(WGET) -P $(DL_DIR) $(PHP_SITE)
php-source: $(DL_DIR)/$(PHP_SOURCE)
^ permalink raw reply [flat|nested] 21+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/php
@ 2009-01-25 20:59 ulf at uclibc.org
0 siblings, 0 replies; 21+ messages in thread
From: ulf at uclibc.org @ 2009-01-25 20:59 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2009-01-25 20:59:30 +0000 (Sun, 25 Jan 2009)
New Revision: 25022
Log:
Fix spelling error, causing php to use host includes, add patching and unpacked targets
Modified:
trunk/buildroot/package/php/php.mk
Changeset:
Modified: trunk/buildroot/package/php/php.mk
===================================================================
--- trunk/buildroot/package/php/php.mk 2009-01-25 20:55:31 UTC (rev 25021)
+++ trunk/buildroot/package/php/php.mk 2009-01-25 20:59:30 UTC (rev 25022)
@@ -87,7 +87,7 @@
PHP_DEPS+=readline
endif
ifeq ($(BR2_PACKAGE_PHP_EXT_NCURSES),y)
- PHP_CONFIGURE+=--with-ncurses=$(STATING_DIR)/usr
+ PHP_CONFIGURE+=--with-ncurses=$(STAGING_DIR)/usr
PHP_DEPS+=ncurses
endif
ifeq ($(BR2_PACKAGE_PHP_EXT_SYSVMSG),y)
@@ -132,6 +132,8 @@
$(PHP_DIR)/.unpacked: $(DL_DIR)/$(PHP_SOURCE)
$(PHP_CAT) $(DL_DIR)/$(PHP_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ toolchain/patch-kernel.sh $(PHP_DIR) package/php/ php\*.patch
+ toolchain/patch-kernel.sh $(PHP_DIR) package/php/ php\*.patch.$(ARCH)
touch $@
$(PHP_DIR)/.configured: $(PHP_DIR)/.unpacked
@@ -184,6 +186,8 @@
php: uclibc $(PHP_DEPS) $(PHP_TARGET_DEPS) $(TARGET_DIR)/etc/php.ini
+php-unpacked: $(PHP_DIR)/.unpacked
+
php-clean:
rm -f $(PHP_DIR)/.configured $(PHP_DIR)/.built $(PHP_DIR)/.staged
rm -f $(PHP_TARGET_DEPS)
^ permalink raw reply [flat|nested] 21+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/php
@ 2009-01-11 20:08 ulf at uclibc.org
0 siblings, 0 replies; 21+ messages in thread
From: ulf at uclibc.org @ 2009-01-11 20:08 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2009-01-11 20:08:47 +0000 (Sun, 11 Jan 2009)
New Revision: 24753
Log:
Bump php version since source is removed due to security risk
Modified:
trunk/buildroot/package/php/php.mk
Changeset:
Modified: trunk/buildroot/package/php/php.mk
===================================================================
--- trunk/buildroot/package/php/php.mk 2009-01-11 19:58:51 UTC (rev 24752)
+++ trunk/buildroot/package/php/php.mk 2009-01-11 20:08:47 UTC (rev 24753)
@@ -3,7 +3,7 @@
# php
#
#############################################################
-PHP_VER:=5.2.7
+PHP_VER:=5.2.8
PHP_SOURCE:=php-$(PHP_VER).tar.bz2
PHP_SITE:=http://us.php.net/get/${PHP_SOURCE}/from/us2.php.net/mirror
PHP_DIR:=$(BUILD_DIR)/php-$(PHP_VER)
^ permalink raw reply [flat|nested] 21+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/php
@ 2008-12-13 11:01 tpetazzoni at uclibc.org
0 siblings, 0 replies; 21+ messages in thread
From: tpetazzoni at uclibc.org @ 2008-12-13 11:01 UTC (permalink / raw)
To: buildroot
Author: tpetazzoni
Date: 2008-12-13 03:01:21 -0800 (Sat, 13 Dec 2008)
New Revision: 24402
Log:
Bump PHP version to 5.2.7.
Patch provided by Gustavo Zacarias <gustavo@zacarias.com.ar>.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Modified:
trunk/buildroot/package/php/php.mk
Changeset:
Modified: trunk/buildroot/package/php/php.mk
===================================================================
--- trunk/buildroot/package/php/php.mk 2008-12-13 10:55:48 UTC (rev 24401)
+++ trunk/buildroot/package/php/php.mk 2008-12-13 11:01:21 UTC (rev 24402)
@@ -3,7 +3,7 @@
# php
#
#############################################################
-PHP_VER:=5.2.6
+PHP_VER:=5.2.7
PHP_SOURCE:=php-$(PHP_VER).tar.bz2
PHP_SITE:=http://us.php.net/get/${PHP_SOURCE}/from/us2.php.net/mirror
PHP_DIR:=$(BUILD_DIR)/php-$(PHP_VER)
^ permalink raw reply [flat|nested] 21+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/php
@ 2008-06-16 9:49 jacmet at uclibc.org
0 siblings, 0 replies; 21+ messages in thread
From: jacmet at uclibc.org @ 2008-06-16 9:49 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-06-16 02:49:47 -0700 (Mon, 16 Jun 2008)
New Revision: 22367
Log:
php: fix s/EXIT/EXT/ typo in simplexml select
Modified:
trunk/buildroot/package/php/Config.ext
Changeset:
Modified: trunk/buildroot/package/php/Config.ext
===================================================================
--- trunk/buildroot/package/php/Config.ext 2008-06-16 07:32:40 UTC (rev 22366)
+++ trunk/buildroot/package/php/Config.ext 2008-06-16 09:49:47 UTC (rev 22367)
@@ -45,7 +45,7 @@
config BR2_PACKAGE_PHP_EXT_SIMPLEXML
bool "simplexml"
depends on BR2_PACKAGE_PHP
- select BR2_PACKAGE_PHP_EXIT_LIBXML2
+ select BR2_PACKAGE_PHP_EXT_LIBXML2
help
SimpleXML support
^ permalink raw reply [flat|nested] 21+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/php
2008-06-02 12:11 ` Peter Korsgaard
@ 2008-06-02 13:15 ` Gustavo Zacarias
0 siblings, 0 replies; 21+ messages in thread
From: Gustavo Zacarias @ 2008-06-02 13:15 UTC (permalink / raw)
To: buildroot
Peter Korsgaard wrote:
>>>>>> "antab" == antab <antab@uclibc.org> writes:
>
> Hi,
>
> antab> Author: antab
> antab> Date: 2008-06-01 11:04:13 -0700 (Sun, 01 Jun 2008)
> antab> New Revision: 22164
>
> antab> Log:
> antab> Dump php to version 5.2.6 and add SimpleXML extension to config menu
>
>
> antab> +config BR2_PACKAGE_PHP_EXT_SIMPLEXML
> antab> + bool "simplexml"
> antab> + depends on BR2_PACKAGE_PHP
> antab> + select BR2_PACKAGE_PHP_EXIT_LIBXML2
>
>
> s/EXIT/EXT ?
>
> package/php/Config.ext:48:warning: 'select' used by config symbol
> 'BR2_PACKAGE_PHP_EXT_SIMPLEXML' refers to undefined symbol
> 'BR2_PACKAGE_PHP_EXIT_LIBXML2'
Wonder if it's related to my report at
http://bugs.uclibc.org/view.php?id=3484
If simplexml is an option shouldn't xmlreader/writer be so too?
They all depend on libxml2 so they're unlikely to trigger bloat by
themselves.
For consistency they should all be options or none.
Regards.
^ permalink raw reply [flat|nested] 21+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/php
2008-06-01 18:04 antab at uclibc.org
2008-06-01 19:31 ` Peter Korsgaard
@ 2008-06-02 12:11 ` Peter Korsgaard
2008-06-02 13:15 ` Gustavo Zacarias
1 sibling, 1 reply; 21+ messages in thread
From: Peter Korsgaard @ 2008-06-02 12:11 UTC (permalink / raw)
To: buildroot
>>>>> "antab" == antab <antab@uclibc.org> writes:
Hi,
antab> Author: antab
antab> Date: 2008-06-01 11:04:13 -0700 (Sun, 01 Jun 2008)
antab> New Revision: 22164
antab> Log:
antab> Dump php to version 5.2.6 and add SimpleXML extension to config menu
antab> +config BR2_PACKAGE_PHP_EXT_SIMPLEXML
antab> + bool "simplexml"
antab> + depends on BR2_PACKAGE_PHP
antab> + select BR2_PACKAGE_PHP_EXIT_LIBXML2
s/EXIT/EXT ?
package/php/Config.ext:48:warning: 'select' used by config symbol
'BR2_PACKAGE_PHP_EXT_SIMPLEXML' refers to undefined symbol
'BR2_PACKAGE_PHP_EXIT_LIBXML2'
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 21+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/php
@ 2008-06-01 19:42 antab at uclibc.org
0 siblings, 0 replies; 21+ messages in thread
From: antab at uclibc.org @ 2008-06-01 19:42 UTC (permalink / raw)
To: buildroot
Author: antab
Date: 2008-06-01 12:42:14 -0700 (Sun, 01 Jun 2008)
New Revision: 22167
Log:
Add missing depends
Modified:
trunk/buildroot/package/php/Config.ext
trunk/buildroot/package/php/php.mk
Changeset:
Modified: trunk/buildroot/package/php/Config.ext
===================================================================
--- trunk/buildroot/package/php/Config.ext 2008-06-01 19:28:44 UTC (rev 22166)
+++ trunk/buildroot/package/php/Config.ext 2008-06-01 19:42:14 UTC (rev 22167)
@@ -145,6 +145,7 @@
config BR2_PACKAGE_PHP_EXT_SQLITE
bool "sqlite"
depends on BR2_PACKAGE_PHP
+ select BR2_PACKAGE_SQLITE
default y
help
SQLite
@@ -173,6 +174,7 @@
config BR2_PACKAGE_PHP_EXT_PDO_MYSQL
bool "PDO_MySQL"
depends on BR2_PACKAGE_PHP && BR2_PACKAGE_PHP_EXT_PDO
+ select BR2_PACKAGE_MYSQL_CLIENT
default n
help
MySQL support for PDO
Modified: trunk/buildroot/package/php/php.mk
===================================================================
--- trunk/buildroot/package/php/php.mk 2008-06-01 19:28:44 UTC (rev 22166)
+++ trunk/buildroot/package/php/php.mk 2008-06-01 19:42:14 UTC (rev 22167)
@@ -109,6 +109,7 @@
### Database extensions
ifeq ($(BR2_PACKAGE_PHP_EXT_SQLITE),y)
PHP_CONFIGURE+=--with-sqlite
+ PHP_DEPS+=sqlite
ifeq ($(BR2_PACKAGE_PHP_EXT_SQLITE_UTF8),y)
PHP_CONFIGURE+=--enable-sqlite-utf8
endif
^ permalink raw reply [flat|nested] 21+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/php
2008-06-01 18:04 antab at uclibc.org
@ 2008-06-01 19:31 ` Peter Korsgaard
2008-06-02 12:11 ` Peter Korsgaard
1 sibling, 0 replies; 21+ messages in thread
From: Peter Korsgaard @ 2008-06-01 19:31 UTC (permalink / raw)
To: buildroot
>>>>> "antab" == antab <antab@uclibc.org> writes:
antab> Author: antab
antab> Date: 2008-06-01 11:04:13 -0700 (Sun, 01 Jun 2008)
antab> New Revision: 22164
antab> Log:
antab> Dump php to version 5.2.6 and add SimpleXML extension to config menu
...
antab> config BR2_PACKAGE_PHP_EXT_OPENSSL
antab> - bool "openssl"
antab> - depends on BR2_PACKAGE_PHP && BR2_PACKAGE_OPENSSL
antab> - default n
antab> - help
antab> - openssl support
antab> + bool "openssl"
antab> + depends on BR2_PACKAGE_PHP && BR2_PACKAGE_OPENSSL
antab> + default n
antab> + help
antab> + openssl support
Please don't do white space and functional changes in the same commit.
antab> @@ -3,7 +3,7 @@
antab> # php
antab> #
antab> #############################################################
antab> -PHP_VER:=5.2.5
antab> +PHP_VER:=5.2.6
antab> PHP_SOURCE:=php-$(PHP_VER).tar.bz2
antab> PHP_SITE:=http://us.php.net/get/${PHP_SOURCE}/from/us2.php.net/mirror
antab> PHP_DIR:=$(BUILD_DIR)/php-$(PHP_VER)
antab> @@ -58,6 +58,9 @@
antab> --enable-xmlwriter
antab> PHP_DEPS+=libxml2
antab> endif
antab> +ifeq ($(BR2_PACKAGE_PHP_EXT_SIMPLEXML),y)
antab> + PHP_CONFIGURE+=--enable-simplexml
antab> +endif
antab> ifeq ($(BR2_PACKAGE_PHP_EXT_ZLIB),y)
antab> PHP_CONFIGURE+=--with-zlib=$(STAGING_DIR)/usr
antab> PHP_DEPS+=zlib
antab> @@ -105,20 +108,20 @@
antab> ### Database extensions
antab> ifeq ($(BR2_PACKAGE_PHP_EXT_SQLITE),y)
antab> - PHP_CONFIGURE+=--with-sql
antab> + PHP_CONFIGURE+=--with-sqlite
Don't you need a depends on BR2_PACKAGE_SQLITE?
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 21+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/php
@ 2008-06-01 18:04 antab at uclibc.org
2008-06-01 19:31 ` Peter Korsgaard
2008-06-02 12:11 ` Peter Korsgaard
0 siblings, 2 replies; 21+ messages in thread
From: antab at uclibc.org @ 2008-06-01 18:04 UTC (permalink / raw)
To: buildroot
Author: antab
Date: 2008-06-01 11:04:13 -0700 (Sun, 01 Jun 2008)
New Revision: 22164
Log:
Dump php to version 5.2.6 and add SimpleXML extension to config menu
Modified:
trunk/buildroot/package/php/Config.ext
trunk/buildroot/package/php/php.mk
Changeset:
Modified: trunk/buildroot/package/php/Config.ext
===================================================================
--- trunk/buildroot/package/php/Config.ext 2008-06-01 17:58:48 UTC (rev 22163)
+++ trunk/buildroot/package/php/Config.ext 2008-06-01 18:04:13 UTC (rev 22164)
@@ -29,19 +29,26 @@
Session support
config BR2_PACKAGE_PHP_EXT_OPENSSL
- bool "openssl"
- depends on BR2_PACKAGE_PHP && BR2_PACKAGE_OPENSSL
- default n
- help
- openssl support
+ bool "openssl"
+ depends on BR2_PACKAGE_PHP && BR2_PACKAGE_OPENSSL
+ default n
+ help
+ openssl support
config BR2_PACKAGE_PHP_EXT_LIBXML2
- bool "xml2"
- depends on BR2_PACKAGE_PHP && BR2_PACKAGE_LIBXML2
- default y
- help
- xml support
+ bool "xml2"
+ depends on BR2_PACKAGE_PHP && BR2_PACKAGE_LIBXML2
+ default y
+ help
+ xml support
+config BR2_PACKAGE_PHP_EXT_SIMPLEXML
+ bool "simplexml"
+ depends on BR2_PACKAGE_PHP
+ select BR2_PACKAGE_PHP_EXIT_LIBXML2
+ help
+ SimpleXML support
+
config BR2_PACKAGE_PHP_EXT_ZLIB
bool "zlib"
depends on BR2_PACKAGE_PHP && BR2_PACKAGE_ZLIB
Modified: trunk/buildroot/package/php/php.mk
===================================================================
--- trunk/buildroot/package/php/php.mk 2008-06-01 17:58:48 UTC (rev 22163)
+++ trunk/buildroot/package/php/php.mk 2008-06-01 18:04:13 UTC (rev 22164)
@@ -3,7 +3,7 @@
# php
#
#############################################################
-PHP_VER:=5.2.5
+PHP_VER:=5.2.6
PHP_SOURCE:=php-$(PHP_VER).tar.bz2
PHP_SITE:=http://us.php.net/get/${PHP_SOURCE}/from/us2.php.net/mirror
PHP_DIR:=$(BUILD_DIR)/php-$(PHP_VER)
@@ -58,6 +58,9 @@
--enable-xmlwriter
PHP_DEPS+=libxml2
endif
+ifeq ($(BR2_PACKAGE_PHP_EXT_SIMPLEXML),y)
+ PHP_CONFIGURE+=--enable-simplexml
+endif
ifeq ($(BR2_PACKAGE_PHP_EXT_ZLIB),y)
PHP_CONFIGURE+=--with-zlib=$(STAGING_DIR)/usr
PHP_DEPS+=zlib
@@ -105,20 +108,20 @@
### Database extensions
ifeq ($(BR2_PACKAGE_PHP_EXT_SQLITE),y)
- PHP_CONFIGURE+=--with-sql
+ PHP_CONFIGURE+=--with-sqlite
ifeq ($(BR2_PACKAGE_PHP_EXT_SQLITE_UTF8),y)
PHP_CONFIGURE+=--enable-sqlite-utf8
endif
endif
ifeq ($(BR2_PACKAGE_PHP_EXT_PDO),y)
+ PHP_CONFIGURE+=--enable-pdo
ifeq ($(BR2_PACKAGE_PHP_EXT_PDO_SQLITE),y)
PHP_CONFIGURE+=--with-pdo-sqlite
endif
ifeq ($(BR2_PACKAGE_PHP_EXT_PDO_MYSQL),y)
- PHP_CONFIGURE+=--with-pdo-mysql
+ PHP_CONFIGURE+=--with-pdo-mysql=$(STAGING_DIR)/usr
+ PHP_DEPS+=mysql_client
endif
-else
- PHP_CONFIGURE+=--without-pdo-sqlite
endif
$(DL_DIR)/$(PHP_SOURCE):
^ permalink raw reply [flat|nested] 21+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/php
@ 2008-03-25 8:49 jacmet at uclibc.org
0 siblings, 0 replies; 21+ messages in thread
From: jacmet at uclibc.org @ 2008-03-25 8:49 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-03-25 01:49:38 -0700 (Tue, 25 Mar 2008)
New Revision: 21490
Log:
php: hide extensions menu if not enabled
Modified:
trunk/buildroot/package/php/Config.in
Changeset:
Modified: trunk/buildroot/package/php/Config.in
===================================================================
--- trunk/buildroot/package/php/Config.in 2008-03-25 07:49:43 UTC (rev 21489)
+++ trunk/buildroot/package/php/Config.in 2008-03-25 08:49:38 UTC (rev 21490)
@@ -31,4 +31,6 @@
help
fast cgi interface for php
+if BR2_PACKAGE_PHP
source "package/php/Config.ext"
+endif
^ permalink raw reply [flat|nested] 21+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/php
@ 2008-03-11 18:14 ninevoltz at uclibc.org
0 siblings, 0 replies; 21+ messages in thread
From: ninevoltz at uclibc.org @ 2008-03-11 18:14 UTC (permalink / raw)
To: buildroot
Author: ninevoltz
Date: 2008-03-11 11:14:42 -0700 (Tue, 11 Mar 2008)
New Revision: 21300
Log:
fixes for php makefile
Modified:
trunk/buildroot/package/php/php.mk
Changeset:
Modified: trunk/buildroot/package/php/php.mk
===================================================================
--- trunk/buildroot/package/php/php.mk 2008-03-11 18:12:15 UTC (rev 21299)
+++ trunk/buildroot/package/php/php.mk 2008-03-11 18:14:42 UTC (rev 21300)
@@ -111,13 +111,14 @@
endif
endif
ifeq ($(BR2_PACKAGE_PHP_EXT_PDO),y)
- PHP_CONFIGURE+=--with-pdo
ifeq ($(BR2_PACKAGE_PHP_EXT_PDO_SQLITE),y)
PHP_CONFIGURE+=--with-pdo-sqlite
endif
ifeq ($(BR2_PACKAGE_PHP_EXT_PDO_MYSQL),y)
- PHP_CONFIGURE+=--with-pod-mysql
+ PHP_CONFIGURE+=--with-pdo-mysql
endif
+else
+ PHP_CONFIGURE+=--without-pdo-sqlite
endif
$(DL_DIR)/$(PHP_SOURCE):
^ permalink raw reply [flat|nested] 21+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/php
@ 2008-03-06 18:21 ninevoltz at uclibc.org
0 siblings, 0 replies; 21+ messages in thread
From: ninevoltz at uclibc.org @ 2008-03-06 18:21 UTC (permalink / raw)
To: buildroot
Author: ninevoltz
Date: 2008-03-06 10:21:33 -0800 (Thu, 06 Mar 2008)
New Revision: 21220
Log:
enhancements for php
Added:
trunk/buildroot/package/php/Config.ext
Modified:
trunk/buildroot/package/php/Config.in
trunk/buildroot/package/php/php.mk
Changeset:
Added: trunk/buildroot/package/php/Config.ext
===================================================================
--- trunk/buildroot/package/php/Config.ext (rev 0)
+++ trunk/buildroot/package/php/Config.ext 2008-03-06 18:21:33 UTC (rev 21220)
@@ -0,0 +1,173 @@
+menu "PHP Extensions"
+
+config BR2_PACKAGE_PHP_EXT_SOCKETS
+ bool "socket"
+ depends on BR2_PACKAGE_PHP
+ default n
+ help
+ Sockets support
+
+config BR2_PACKAGE_PHP_EXT_POSIX
+ bool "posix"
+ depends on BR2_PACKAGE_PHP
+ default y
+ help
+ POSIX support
+
+config BR2_PACKAGE_PHP_EXT_SPL
+ bool "SPL"
+ depends on BR2_PACKAGE_PHP
+ default y
+ help
+ SPL support
+
+config BR2_PACKAGE_PHP_EXT_SESSION
+ bool "Session"
+ depends on BR2_PACKAGE_PHP
+ default y
+ help
+ Session support
+
+config BR2_PACKAGE_PHP_EXT_OPENSSL
+ bool "openssl"
+ depends on BR2_PACKAGE_PHP && BR2_PACKAGE_OPENSSL
+ default n
+ help
+ openssl support
+
+config BR2_PACKAGE_PHP_EXT_LIBXML2
+ bool "xml2"
+ depends on BR2_PACKAGE_PHP && BR2_PACKAGE_LIBXML2
+ default y
+ help
+ xml support
+
+config BR2_PACKAGE_PHP_EXT_ZLIB
+ bool "zlib"
+ depends on BR2_PACKAGE_PHP && BR2_PACKAGE_ZLIB
+ default y
+ help
+ zlib support
+
+config BR2_PACKAGE_PHP_EXT_EXIF
+ bool "EXIF"
+ depends on BR2_PACKAGE_PHP
+ default n
+ help
+ EXIF support
+
+config BR2_PACKAGE_PHP_EXT_FTP
+ bool "FTP"
+ depends on BR2_PACKAGE_PHP
+ default n
+ help
+ FTP Support
+
+config BR2_PACKAGE_PHP_EXT_GETTEXT
+ bool "gettext"
+ depends on BR2_PACKAGE_PHP && BR2_PACKAGE_GETTEXT
+ default n
+ help
+ gettext support
+
+config BR2_PACKAGE_PHP_EXT_GMP
+ bool "gmp"
+ depends on BR2_PACKAGE_PHP && BR2_PACKAGE_LIBGMP
+ default n
+ help
+ GMP support
+
+config BR2_PACKAGE_PHP_EXT_JSON
+ bool "JSON"
+ depends on BR2_PACKAGE_PHP
+ default n
+ help
+ JSON support
+
+config BR2_PACKAGE_PHP_EXT_READLINE
+ bool "readline"
+ depends on BR2_PACKAGE_PHP && (BR2_PACKAGE_PHP_CLI || BR2_PACKAGE_PHP_CGI) && BR2_READLINE
+ default n
+ help
+ readline support
+
+config BR2_PACKAGE_PHP_EXT_NCURSES
+ bool "ncurses"
+ depends on BR2_PACKAGE_PHP && (BR2_PACKAGE_PHP_CLI || BR2_PACKAGE_PHP_CGI) && BR2_PACKAGE_NCURSES
+ default n
+ help
+ ncurses support
+
+config BR2_PACKAGE_PHP_EXT_SYSVMSG
+ bool "sysvmsg - System V Message queue"
+ depends on BR2_PACKAGE_PHP
+ default n
+ help
+ System V Message queue support
+
+config BR2_PACKAGE_PHP_EXT_SYSVSEM
+ bool "sysvsem - System V Semaphores"
+ depends on BR2_PACKAGE_PHP
+ default n
+ help
+ System V Sempahore support
+
+config BR2_PACKAGE_PHP_EXT_SYSVSHM
+ bool "sysvshm - System V Shared memory"
+ depends on BR2_PACKAGE_PHP
+ default n
+ help
+ System V Shared memory support
+
+config BR2_PACKAGE_PHP_EXT_ZIP
+ bool "zip"
+ depends on BR2_PACKAGE_PHP
+ default n
+ help
+ Zip Support
+
+config BR2_PACKAGE_PHP_EXT_FILTER
+ bool "filter"
+ depends on BR2_PACKAGE_PHP
+ default n
+ help
+ Input filter support
+
+comment "Database extensions"
+
+config BR2_PACKAGE_PHP_EXT_SQLITE
+ bool "sqlite"
+ depends on BR2_PACKAGE_PHP
+ default y
+ help
+ SQLite
+
+config BR2_PACKAGE_PHP_EXT_SQLITE_UTF8
+ bool "sqlite UTF8 support"
+ depends on BR2_PACKAGE_PHP && BR2_PACKAGE_PHP_EXT_SQLITE
+ default n
+ help
+ UTF8 Support for sqlite
+
+config BR2_PACKAGE_PHP_EXT_PDO
+ bool "PDO"
+ depends on BR2_PACKAGE_PHP
+ default y
+ help
+ PDO support
+
+config BR2_PACKAGE_PHP_EXT_PDO_SQLITE
+ bool "PDO_SQLite"
+ depends on BR2_PACKAGE_PHP && BR2_PACKAGE_PHP_EXT_PDO
+ default y
+ help
+ SQLite support for PDO
+
+config BR2_PACKAGE_PHP_EXT_PDO_MYSQL
+ bool "PDO_MySQL"
+ depends on BR2_PACKAGE_PHP && BR2_PACKAGE_PHP_EXT_PDO
+ default n
+ help
+ MySQL support for PDO
+
+endmenu
Modified: trunk/buildroot/package/php/Config.in
===================================================================
--- trunk/buildroot/package/php/Config.in 2008-03-06 18:21:04 UTC (rev 21219)
+++ trunk/buildroot/package/php/Config.in 2008-03-06 18:21:33 UTC (rev 21220)
@@ -31,24 +31,4 @@
help
fast cgi interface for php
-config BR2_PACKAGE_PHP_OPENSSL
- bool "openssl support"
- depends on BR2_PACKAGE_PHP && BR2_PACKAGE_OPENSSL
- default y
- help
- openssl support
-
-config BR2_PACKAGE_PHP_XML2
- bool "xml2 support"
- depends on BR2_PACKAGE_PHP && BR2_PACKAGE_LIBXML2
- default y
- help
- xml support
-
-config BR2_PACKAGE_PHP_ZLIB
- bool "zlib support"
- depends on BR2_PACKAGE_PHP && BR2_PACKAGE_ZLIB
- default y
- help
- zlib support
-
+source "package/php/Config.ext"
Modified: trunk/buildroot/package/php/php.mk
===================================================================
--- trunk/buildroot/package/php/php.mk 2008-03-06 18:21:04 UTC (rev 21219)
+++ trunk/buildroot/package/php/php.mk 2008-03-06 18:21:33 UTC (rev 21220)
@@ -3,50 +3,122 @@
# php
#
#############################################################
-PHP_VER:=5.2.3
+PHP_VER:=5.2.5
PHP_SOURCE:=php-$(PHP_VER).tar.bz2
PHP_SITE:=http://us.php.net/get/${PHP_SOURCE}/from/us2.php.net/mirror
PHP_DIR:=$(BUILD_DIR)/php-$(PHP_VER)
PHP_CAT=$(BZCAT)
PHP_DEPS=
PHP_TARGET_DEPS=
+PHP_CONFIGURE = $(ENABLE_DEBUG)
ifneq ($(BR2_PACKAGE_PHP_CLI),y)
- PHP_CLI="--disable-cli"
+ PHP_CONFIGURE+=--disable-cli
else
- PHP_CLI="--enable-cli"
+ PHP_CONFIGURE+=--enable-cli
PHP_TARGET_DEPS+=$(TARGET_DIR)/usr/bin/php
endif
ifneq ($(BR2_PACKAGE_PHP_CGI),y)
- PHP_CGI=--disable-cgi
+ PHP_CONFIGURE+=--disable-cgi
else
- PHP_CGI=--enable-cgi
+ PHP_CONFIGURE=--enable-cgi
PHP_TARGET_DEPS+=$(TARGET_DIR)/usr/bin/php-cgi
ifeq ($(BR2_PACKAGE_PHP_FASTCGI),y)
- PHP_CGI+=--enable-fastcgi
+ PHP_CONFIGURE+=--enable-fastcgi
endif
endif
-ifeq ($(BR2_PACKAGE_PHP_OPENSSL),y)
- PHP_OPENSSL="--with-openssl=$(STAGING_DIR)/usr"
+ifneq ($(BR2_INET_IPV6),y)
+ PHP_CONFIGURE+=--disable-ipv6
+endif
+
+### Extensions
+ifeq ($(BR2_PACKAGE_PHP_EXT_SOCKETS),y)
+ PHP_CONFIGURE+=--enable-sockets
+endif
+ifeq ($(BR2_PACKAGE_PHP_EXT_POSIX),y)
+ PHP_CONFIGURE+=--enable-posix
+endif
+ifeq ($(BR2_PACKAGE_PHP_EXT_SPL),y)
+ PHP_CONFIGURE+=--enable-spl
+endif
+ifeq ($(BR2_PACKAGE_PHP_EXT_SESSION),y)
+ PHP_CONFIGURE+=--enable-session
+endif
+ifeq ($(BR2_PACKAGE_PHP_EXT_OPENSSL),y)
+ PHP_CONFIGURE+=--with-openssl=$(STAGING_DIR)/usr
PHP_DEPS+=openssl
endif
-
-ifeq ($(BR2_PACKAGE_PHP_XML2),y)
- PHP_XML=--enable-libxml \
+ifeq ($(BR2_PACKAGE_PHP_EXT_LIBXML2),y)
+ PHP_CONFIGURE+=--enable-libxml \
--with-libxml-dir=${STAGING_DIR}/usr \
--enable-xml \
--enable-xmlreader \
--enable-xmlwriter
PHP_DEPS+=libxml2
endif
-
-ifeq ($(BR2_PACKAGE_PHP_ZLIB),y)
- PHP_ZLIB="--with-zlib=$(STAGING_DIR)/usr"
+ifeq ($(BR2_PACKAGE_PHP_EXT_ZLIB),y)
+ PHP_CONFIGURE+=--with-zlib=$(STAGING_DIR)/usr
PHP_DEPS+=zlib
endif
+ifeq ($(BR2_PACKAGE_PHP_EXT_EXIF),y)
+ PHP_CONFIGURE+=--enable-exif
+endif
+ifeq ($(BR2_PACKAGE_PHP_EXT_FTP),y)
+ PHP_CONFIGURE+=--enable-ftp
+endif
+ifeq ($(BR2_PACKAGE_PHP_EXT_GETTEXT),y)
+ PHP_CONFIGURE+=--with-gettext=$(STAGING_DIR)/usr
+ PHP_DEPS+=gettext
+endif
+ifeq ($(BR2_PACKAGE_PHP_EXT_GMP),y)
+ PHP_CONFIGURE+=--with-gmp=$(STAGING_DIR)/usr
+ PHP_DEPS+=libgmp
+endif
+ifeq ($(BR2_PACKAGE_PHP_EXT_JSON),y)
+ PHP_CONFIGURE+=--enable-json
+endif
+ifeq ($(BR2_PACKAGE_PHP_EXT_READLINE),y)
+ PHP_CONFIGURE+=--with-readline=$(STAGING_DIR)/usr
+ PHP_DEPS+=readline
+endif
+ifeq ($(BR2_PACKAGE_PHP_EXT_NCURSES),y)
+ PHP_CONFIGURE+=--with-ncurses=$(STATING_DIR)/usr
+ PHP_DEPS+=ncurses
+endif
+ifeq ($(BR2_PACKAGE_PHP_EXT_SYSVMSG),y)
+ PHP_CONFIGURE+=--enable-sysvmsg
+endif
+ifeq ($(BR2_PACKAGE_PHP_EXT_SYSVSEM),y)
+ PHP_CONFIGURE+=--enable-sysvsem
+endif
+ifeq ($(BR2_PACKAGE_PHP_EXT_SYSVSHM),y)
+ PHP_CONFIGURE+=--enable-sysvshm
+endif
+ifeq ($(BR2_PACKAGE_PHP_EXT_ZIP),y)
+ PHP_CONFIGURE+=--enable-zip
+endif
+ifeq ($(BR2_PACKAGE_PHP_EXT_FILTER),y)
+ PHP_CONFIGURE+=--enable-filter
+endif
+### Database extensions
+ifeq ($(BR2_PACKAGE_PHP_EXT_SQLITE),y)
+ PHP_CONFIGURE+=--with-sql
+ifeq ($(BR2_PACKAGE_PHP_EXT_SQLITE_UTF8),y)
+ PHP_CONFIGURE+=--enable-sqlite-utf8
+endif
+endif
+ifeq ($(BR2_PACKAGE_PHP_EXT_PDO),y)
+ PHP_CONFIGURE+=--with-pdo
+ifeq ($(BR2_PACKAGE_PHP_EXT_PDO_SQLITE),y)
+ PHP_CONFIGURE+=--with-pdo-sqlite
+endif
+ifeq ($(BR2_PACKAGE_PHP_EXT_PDO_MYSQL),y)
+ PHP_CONFIGURE+=--with-pod-mysql
+endif
+endif
$(DL_DIR)/$(PHP_SOURCE):
$(WGET) -P $(DL_DIR) $(PHP_SITE)
@@ -62,7 +134,7 @@
$(TARGET_CONFIGURE_OPTS) \
$(TARGET_CONFIGURE_ARGS) \
CC=$(TARGET_CC) \
- ./configure \
+ ./configure $(DISABLE_NLS) \
--target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) \
@@ -78,19 +150,9 @@
--mandir=/usr/man \
--infodir=/usr/info \
--disable-all \
- --enable-spl \
- --enable-session \
- --enable-sockets \
- --enable-posix \
--with-pcre-regex \
--without-pear \
- --disable-ipv6 \
- $(DISABLE_NLS) \
- $(PHP_OPENSSL) \
- $(PHP_XML) \
- $(PHP_CLI) \
- $(PHP_CGI) \
- $(PHP_ZLIB) \
+ $(PHP_CONFIGURE) \
)
touch $@
@@ -119,7 +181,7 @@
php-clean:
rm -f $(PHP_DIR)/.configured $(PHP_DIR)/.built $(PHP_DIR)/.staged
- rm -f $(TARGET_DIR)/usr/bin/php $(TARGET_DIR)/usr/bin/php-cgi
+ rm -f $(PHP_TARGET_DEPS)
rm -f $(STAGING_DIR)/usr/bin/php* $(STAGING_DIR)/usr/man/man1/php*
rm -rf $(STAGING_DIR)/usr/include/php
-$(MAKE) -C $(PHP_DIR) clean
^ permalink raw reply [flat|nested] 21+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/php
@ 2007-08-19 21:02 ulf at uclibc.org
0 siblings, 0 replies; 21+ messages in thread
From: ulf at uclibc.org @ 2007-08-19 21:02 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-08-19 14:02:46 -0700 (Sun, 19 Aug 2007)
New Revision: 19566
Log:
Fr?\195?\165n: Brad House <brad@mainstreetsoftworks.com>
Till: buildroot at uclibc.org
?\195?\132mne: [Buildroot] [patch] php fixes and updates
Datum: Tue, 14 Aug 2007 16:39:03 -0400 (22.39 CEST)
Changes:
- fastcgi config option
- force php to find the php.ini in /etc (it seems to default
to /lib for some reason)
- build with posix support, a lot of php scripts require
this apparently
- strip the php binary when installing to TARGET_DIR
- actually 'uninstall' php on a php-clean
-Brad
Modified:
trunk/buildroot/package/php/Config.in
trunk/buildroot/package/php/php.mk
Changeset:
Modified: trunk/buildroot/package/php/Config.in
===================================================================
--- trunk/buildroot/package/php/Config.in 2007-08-19 20:59:37 UTC (rev 19565)
+++ trunk/buildroot/package/php/Config.in 2007-08-19 21:02:46 UTC (rev 19566)
@@ -24,6 +24,13 @@
cgi interface for php
you must have at least cli or cgi selected.
+config BR2_PACKAGE_PHP_FASTCGI
+ bool "fastcgi"
+ depends on BR2_PACKAGE_PHP_CGI
+ default y
+ help
+ fast cgi interface for php
+
config BR2_PACKAGE_PHP_OPENSSL
bool "openssl support"
depends on BR2_PACKAGE_PHP && BR2_PACKAGE_OPENSSL
Modified: trunk/buildroot/package/php/php.mk
===================================================================
--- trunk/buildroot/package/php/php.mk 2007-08-19 20:59:37 UTC (rev 19565)
+++ trunk/buildroot/package/php/php.mk 2007-08-19 21:02:46 UTC (rev 19566)
@@ -19,10 +19,13 @@
endif
ifneq ($(BR2_PACKAGE_PHP_CGI),y)
- PHP_CGI="--disable-cgi"
+ PHP_CGI=--disable-cgi
else
- PHP_CGI="--enable-cgi"
+ PHP_CGI=--enable-cgi
PHP_TARGET_DEPS+=$(TARGET_DIR)/usr/bin/php-cgi
+ ifeq ($(BR2_PACKAGE_PHP_FASTCGI),y)
+ PHP_CGI+=--enable-fastcgi
+ endif
endif
ifeq ($(BR2_PACKAGE_PHP_OPENSSL),y)
@@ -69,6 +72,7 @@
--sbindir=/usr/sbin \
--libexecdir=/usr/lib \
--sysconfdir=/etc \
+ --with-config-file-path=/etc \
--datadir=/usr/share/misc \
--localstatedir=/var \
--mandir=/usr/man \
@@ -77,6 +81,7 @@
--enable-spl \
--enable-session \
--enable-sockets \
+ --enable-posix \
--with-pcre-regex \
--without-pear \
--disable-ipv6 \
@@ -100,10 +105,12 @@
$(TARGET_DIR)/usr/bin/php: $(PHP_DIR)/.staged
cp -dpf $(STAGING_DIR)/usr/bin/php $(TARGET_DIR)/usr/bin/php
chmod 755 $(TARGET_DIR)/usr/bin/php
+ $(STRIP) --strip-unneeded $(TARGET_DIR)/usr/bin/php
$(TARGET_DIR)/usr/bin/php-cgi: $(PHP_DIR)/.staged
cp -dpf $(STAGING_DIR)/usr/bin/php-cgi $(TARGET_DIR)/usr/bin/php-cgi
chmod 755 $(TARGET_DIR)/usr/bin/php-cgi
+ $(STRIP) --strip-unneeded $(TARGET_DIR)/usr/bin/php-cgi
$(TARGET_DIR)/etc/php.ini: $(PHP_DIR)/.staged
cp $(PHP_DIR)/php.ini-dist $(TARGET_DIR)/etc/php.ini
@@ -112,6 +119,9 @@
php-clean:
rm -f $(PHP_DIR)/.configured $(PHP_DIR)/.built $(PHP_DIR)/.staged
+ rm -f $(TARGET_DIR)/usr/bin/php $(TARGET_DIR)/usr/bin/php-cgi
+ rm -f $(STAGING_DIR)/usr/bin/php* $(STAGING_DIR)/usr/man/man1/php*
+ rm -rf $(STAGING_DIR)/usr/include/php
-$(MAKE) -C $(PHP_DIR) clean
php-dirclean:
^ permalink raw reply [flat|nested] 21+ messages in thread
end of thread, other threads:[~2009-03-04 20:58 UTC | newest]
Thread overview: 21+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-03-04 20:58 [Buildroot] svn commit: trunk/buildroot/package/php jacmet at uclibc.org
-- strict thread matches above, loose matches on Subject: below --
2009-03-04 20:58 jacmet at uclibc.org
2009-03-02 19:05 jacmet at uclibc.org
2009-02-25 19:51 jacmet at uclibc.org
2009-02-21 9:06 jacmet at uclibc.org
2009-02-21 9:06 jacmet at uclibc.org
2009-02-20 21:55 jacmet at uclibc.org
2009-02-20 15:13 jacmet at uclibc.org
2009-01-25 20:59 ulf at uclibc.org
2009-01-11 20:08 ulf at uclibc.org
2008-12-13 11:01 tpetazzoni at uclibc.org
2008-06-16 9:49 jacmet at uclibc.org
2008-06-01 19:42 antab at uclibc.org
2008-06-01 18:04 antab at uclibc.org
2008-06-01 19:31 ` Peter Korsgaard
2008-06-02 12:11 ` Peter Korsgaard
2008-06-02 13:15 ` Gustavo Zacarias
2008-03-25 8:49 jacmet at uclibc.org
2008-03-11 18:14 ninevoltz at uclibc.org
2008-03-06 18:21 ninevoltz at uclibc.org
2007-08-19 21:02 ulf at uclibc.org
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.