Skip to contentSkip to conversation

php: bump to version 5.3.18

PATCH New Gustavo Zacarias 3 participants 6 messages Oct 30, 2012

lore
Share & tools
lore

Gustavo Zacarias

author
#0 lore raw

PATCH 1/2 php: bump to version 5.3.18

Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/php/Config.in                     |    4 ++
 package/php/php-force-cross-compile.patch |   50 -----------------------------
 package/php/php.mk                        |    2 +-
 3 files changed, 5 insertions(+), 51 deletions(-)
 delete mode 100644 package/php/php-force-cross-compile.patch
package/php/Config.in +4 -0
index c8c100c..6d15da5 100644
@@ -25,6 +25,8 @@ choice
 
 config BR2_PACKAGE_PHP_SAPI_CGI
 	bool "CGI"
+	# CGI uses fork()
+	depends on BR2_USE_MMU
 	select BR2_PACKAGE_PHP_CGI
 	help
 	  Common Gateway Interface

@@ -37,6 +39,8 @@ config BR2_PACKAGE_PHP_SAPI_CLI
 
 config BR2_PACKAGE_PHP_SAPI_CLI_CGI
         bool "CGI and CLI"
+	# CGI uses fork()
+	depends on BR2_USE_MMU
 	select BR2_PACKAGE_PHP_CLI
 	select BR2_PACKAGE_PHP_CGI
 	help
package/php/php-force-cross-compile.patch deleted +0 -50

50 lines not on this page · raw message

package/php/php.mk +1 -1
index 2f8e99e..6ac9f29 100644
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-PHP_VERSION = 5.3.16
+PHP_VERSION = 5.3.18
 PHP_SOURCE = php-$(PHP_VERSION).tar.bz2
 PHP_SITE = http://www.php.net/distributions
 PHP_INSTALL_STAGING = YES
Signature · 1 line
1.7.8.6
author
#1 lore raw

PATCH 2/2 samba: bump to version 3.6.9

Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/samba/samba.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
package/samba/samba.mk +1 -1
index 7c06e14..06f58d6 100644
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-SAMBA_VERSION = 3.6.8
+SAMBA_VERSION = 3.6.9
 SAMBA_SITE = http://ftp.samba.org/pub/samba/stable
 SAMBA_SUBDIR = source3
 SAMBA_INSTALL_STAGING = YES
Signature · 1 line
1.7.8.6
#2 lore raw

PATCH 1/2 php: bump to version 5.3.18

In reply to Gustavo Zacarias

Dear Gustavo Zacarias,

Quoted 4 lines · Gustavo Zacarias
Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/php/Config.in                     |    4 ++
 package/php/php-force-cross-compile.patch |   50 -----------------------------

So you are sure this patch is no longer needed? See the explanation
below: the problem can only be triggered if the build machine has the same architecture as the target machine.

Quoted 22 lines
package/php/php-force-cross-compile.patch deleted +0 -22
-In its configure script, PHP detects whether we're cross-compiling or
-not, by compiling and running a simple C program. Depending on whether
-cross-compiling has been detected or not, then PHP enables or disables
-the AC_TRY_RUN tests (which verify the availability of something by
-*executing* a program, which, by definition, cannot work in
-cross-compilation mode).
-
-This works just fine when the target architecture is ARM or PowerPC
-and the build machine is x86 or x86_64. Unfortunately, when the target
-architecture is x86_64 and the build machine is also x86_64, the
-cross-compilation mode detection concludes that we are not
-cross-compiling, because it succeeds in running this small program.
-
-However, while it succeeds in running this basic small program, some
-other programs executed later through AC_TRY_RUN tests do not work,
-because they have target library dependencies that are not available
-on the build machine. For example, the libxml2 test fails to *run*
-because libxml2 is not available on the build machine, only in the
-target/staging directories. So trying to run a program linked against
-libxml2, on the build machine, simply doesn't make sense.
-
-We fix this problem by just forcing PHP to think that we're

package/php/php-force-cross-compile.patch line 34

Quoted 10 lines
package/php/php-force-cross-compile.patch deleted +0 -10
-cross-compiling (which is always the case with Buildroot, as we're at
-the moment never building PHP for the host). Unfortunately, the
-configure.in file dates back from the autoconf 2.13 era, so the
-configure script does not understand the ac_cv_prog_cc_cross cache
-variable, and we cannot easily regenerate the configure script using
-our package autoconf version. The easiest solution is therefore to
-simply patch the configure script to make the cross-compilation test
-fail: we replace the execution of the program by a call to false,
-which always fail, leading the configure script to understand that we
-*are* cross-compiling.

Thanks,

Thomas

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
author
#3 lore raw

PATCH 1/2 php: bump to version 5.3.18

Quoted 11 lines · Thomas Petazzoni

Dear Gustavo Zacarias,

Quoted 4 lines · Gustavo Zacarias
Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/php/Config.in                     |    4 ++
 package/php/php-force-cross-compile.patch |   50 -----------------------------

So you are sure this patch is no longer needed? See the explanation
below: the problem can only be triggered if the build machine has the same architecture as the target machine.

Oh yes, i've tested x86_64->x86_64 besides a "cross" target. They've dropped all of the cross macros, guess they switched everything to AC_TRY_LINK and other similar macros.
It's kind of amazing they've fixed this upstream right? :) Regards.

#4 lore raw

PATCH 1/2 php: bump to version 5.3.18

Quoted 3 lines · Gustavo Zacarias

Oh yes, i've tested x86_64->x86_64 besides a "cross" target. They've dropped all of the cross macros, guess they switched everything to AC_TRY_LINK and other similar macros.

Great.

Quoted 1 line

It's kind of amazing they've fixed this upstream right? :)

Incredible, indeed :)

Thanks,

Thomas

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com