Skip to contentSkip to conversation

php: bump to version 5.5.6

PATCH New Gustavo Zacarias 2 participants 4 messages Dec 8, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 php: bump to version 5.5.6

---
 package/php/Config.ext | 14 +++-----------
 package/php/php.mk     | 14 ++------------
 2 files changed, 5 insertions(+), 23 deletions(-)
package/php/Config.ext +3 -11
index 23d2306..ff41b42 100644
@@ -91,17 +91,6 @@ config BR2_PACKAGE_PHP_EXT_DBA_INI
 
 endif
 
-config BR2_PACKAGE_PHP_EXT_SQLITE
-	bool "SQLite"
-	help
-	  Legacy SQLite2 support
-
-config BR2_PACKAGE_PHP_EXT_SQLITE_UTF8
-	bool "sqlite UTF8 support"
-	depends on BR2_PACKAGE_PHP_EXT_SQLITE
-	help
-	  UTF8 support for sqlite
-
 config BR2_PACKAGE_PHP_EXT_MYSQL
 	bool "Mysql"
 	depends on BR2_INSTALL_LIBSTDCPP
@@ -227,6 +216,7 @@ config BR2_PACKAGE_PHP_EXT_FTP
 
 config BR2_PACKAGE_PHP_EXT_SNMP
 	bool "SNMP"
+	depends on BR2_USE_MMU # netsnmp fork()
 	select BR2_PACKAGE_NETSNMP
 	select BR2_PACKAGE_NETSNMP_ENABLE_MIBS
 	help
@@ -234,6 +224,7 @@ config BR2_PACKAGE_PHP_EXT_SNMP
 
 config BR2_PACKAGE_PHP_EXT_SOCKETS
 	bool "sockets"
+	depends on BR2_INET_IPV6
 	help
 	  Sockets support
 
@@ -241,6 +232,7 @@ comment "Process Control"
 
 config BR2_PACKAGE_PHP_EXT_PCNTL
 	bool "PCNTL"
+	depends on BR2_USE_MMU # fork()
 	help
 	  Process control support
 
package/php/php.mk +2 -12
index 3e284f2..8b4a727 100644
@@ -4,12 +4,13 @@
 #
 ################################################################################
 
-PHP_VERSION = 5.3.27
+PHP_VERSION = 5.5.6
 PHP_SOURCE = php-$(PHP_VERSION).tar.xz
 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_DEPENDENCIES = host-pkgconf
 PHP_LICENSE = PHP
 PHP_LICENSE_FILES = LICENSE
 PHP_CONF_OPT =  --mandir=/usr/share/man \
@@ -125,17 +126,6 @@ ifeq ($(BR2_PACKAGE_PHP_EXT_READLINE),y)
 	PHP_DEPENDENCIES += readline
 endif
 
-### Legacy sqlite2 support
-ifeq ($(BR2_PACKAGE_PHP_EXT_SQLITE),y)
-	PHP_CONF_OPT += --with-sqlite
-ifneq ($(BR2_LARGEFILE),y)
-	PHP_CFLAGS += -DSQLITE_DISABLE_LFS
-endif
-ifeq ($(BR2_PACKAGE_PHP_EXT_SQLITE_UTF8),y)
-	PHP_CONF_OPT += --enable-sqlite-utf8
-endif
-endif
-
 ### Native MySQL extensions
 ifeq ($(BR2_PACKAGE_PHP_EXT_MYSQL),y)
 	PHP_CONF_OPT += --with-mysql=$(STAGING_DIR)/usr
Signature · 1 line
1.8.3.2
#1 lore raw

PATCH 1/1 php: bump to version 5.5.6

Dear Gustavo Zacarias,

package/php/Config.ext config BR2_PACKAGE_PHP_EXT_DBA_INI · line 103

Quoted 10 lines · Gustavo Zacarias
package/php/Config.ext +0 -10
-config BR2_PACKAGE_PHP_EXT_SQLITE
-	bool "SQLite"
-	help
-	  Legacy SQLite2 support
-
-config BR2_PACKAGE_PHP_EXT_SQLITE_UTF8
-	bool "sqlite UTF8 support"
-	depends on BR2_PACKAGE_PHP_EXT_SQLITE
-	help
-	  UTF8 support for sqlite

Config.in.legacy maybe?

Quoted 12 lines

config BR2_PACKAGE_PHP_EXT_MYSQL

package/php/Config.ext +1 -0
 	bool "Mysql"
 	depends on BR2_INSTALL_LIBSTDCPP
@@ -227,6 +216,7 @@ config BR2_PACKAGE_PHP_EXT_FTP
 
 config BR2_PACKAGE_PHP_EXT_SNMP
 	bool "SNMP"
+	depends on BR2_USE_MMU # netsnmp fork()
 	select BR2_PACKAGE_NETSNMP
 	select BR2_PACKAGE_NETSNMP_ENABLE_MIBS
 	help

package/php/Config.ext config BR2_PACKAGE_PHP_EXT_SNMP · line 229

Quoted 6 lines
package/php/Config.ext +1 -0
@@ -234,6 +224,7 @@ config BR2_PACKAGE_PHP_EXT_SNMP
 
 config BR2_PACKAGE_PHP_EXT_SOCKETS
 	bool "sockets"
+	depends on BR2_INET_IPV6
 	help
 	  Sockets support

New comment ?

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#2 lore raw

PATCH 1/1 php: bump to version 5.5.6

Quoted 4 lines · Thomas Petazzoni
Quoted 4 lines
package/php/Config.ext +0 -4
-config BR2_PACKAGE_PHP_EXT_SQLITE
-	bool "SQLite"
-	help
-	  Legacy SQLite2 support
Quoted 8 lines

package/php/Config.ext config BR2_PACKAGE_PHP_EXT_DBA_INI · line 103

Quoted 6 lines
package/php/Config.ext +0 -6
-
-config BR2_PACKAGE_PHP_EXT_SQLITE_UTF8
-	bool "sqlite UTF8 support"
-	depends on BR2_PACKAGE_PHP_EXT_SQLITE
-	help
-	  UTF8 support for sqlite

Config.in.legacy maybe?

That's a language extension/construct that's been thrown out. Unfortunately there are other builtins that aren't options that suffer the same fate, so anyone migrating code from an older php series will have to check/adapt their code as usual, i don't see much point in just warning the user for a rarely used extension.
I think it'll just give the impression that everything else is the same and it's not.
They'll have to read http://www.php.net/migration55 and
http://www.php.net/migration54 and check their code anyway (where it's already mentioned).

Quoted 7 lines

package/php/Config.ext config BR2_PACKAGE_PHP_EXT_SNMP · line 229

Quoted 5 lines

config BR2_PACKAGE_PHP_EXT_SOCKETS

package/php/Config.ext +1 -0
 	bool "sockets"
+	depends on BR2_INET_IPV6
 	help
 	  Sockets support

New comment ?

True, i'll fix it in v2.
Regards.

#3 lore raw

PATCH 1/1 php: bump to version 5.5.6

Dear Gustavo Zacarias,

Quoted 10 lines · Gustavo Zacarias

That's a language extension/construct that's been thrown out. Unfortunately there are other builtins that aren't options that suffer the same fate, so anyone migrating code from an older php series will have to check/adapt their code as usual, i don't see much point in just warning the user for a rarely used extension.
I think it'll just give the impression that everything else is the same and it's not.
They'll have to read http://www.php.net/migration55 and
http://www.php.net/migration54 and check their code anyway (where it's already mentioned).

Ok, true, I understand the idea.

Quoted 3 lines
Quoted 1 line

New comment ?

True, i'll fix it in v2.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com