Skip to contentSkip to conversation

php: add patch to fix build on static-only systems

PATCH New Thomas Petazzoni 2 participants 4 messages Feb 26, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 php: add patch to fix build on static-only systems

This commit adds a patch to PHP to fix the build on static-only system, a regression introduced in PHP recently.

Fixes:

http://autobuild.buildroot.net/results/fbf7ebbb9502424727006f39e169ec1ee870186d/

---
 ...i.c-build-empty-php_load_zend_extension_c.patch | 62 ++++++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 package/php/0009-main-php_ini.c-build-empty-php_load_zend_extension_c.patch
package/php/0009-main-php_ini.c-build-empty-php_load_zend_extension_c.patch new file +62 -0
new file mode 100644
index 0000000000..bc5149d1d6
@@ -0,0 +1,62 @@
+From b7bbdfbcb0869b5c068143d4e27bab9eac4ae72b Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <[email protected]>
+Date: Mon, 26 Feb 2018 19:30:55 +0100
+Subject: [PATCH] main/php_ini.c: build empty php_load_zend_extension_cb() when
+ !HAVE_LIBDL
+
+Commit 0782a7fc6314c8bd3cbfd57f12d0479bf9cc8dc7 ("Fixed bug #74866
+extension_dir = "./ext" now use current directory for base") modified
+the php_load_zend_extension_cb() function to use php_load_shlib(), and
+pass a handle to the newly introduced zend_load_extension_handle()
+function instead of passing the extension path to
+zend_load_extension().
+
+While doing so, it introduced a call to php_load_shlib() from code
+that is built even when HAVE_LIBDL is not defined. However,
+php_load_shlib() is not implemented when HAVE_LIBDL is not defined,
+for obvious reasons.
+
+It turns out that zend_load_extension_handle() anyway doesn't do
+anything when ZEND_EXTENSIONS_SUPPORT is defined to 0, and
+ZEND_EXTENSIONS_SUPPORT is not defined when HAVE_LIBDL is not defined
+(Zend/zend_portability.h).
+
+Fixes the following build failure when building on a system that
+doesn't have libdl:
+
+main/php_ini.o: In function `php_load_zend_extension_cb':
+php_ini.c:(.text+0x478): undefined reference to `php_load_shlib'
+php_ini.c:(.text+0x4b0): undefined reference to `php_load_shlib'
+collect2: error: ld returned 1 exit status
+
+Signed-off-by: Thomas Petazzoni <[email protected]>
+Upstream-status: https://github.com/php/php-src/pull/3161
+---
+ main/php_ini.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/main/php_ini.c b/main/php_ini.c
+index ba58eb1180..fca263e5f0 100644
+--- a/main/php_ini.c
++++ b/main/php_ini.c
+@@ -350,6 +350,7 @@ static void php_load_php_extension_cb(void *arg)
+ 
+ /* {{{ php_load_zend_extension_cb
+  */
++#ifdef HAVE_LIBDL
+ static void php_load_zend_extension_cb(void *arg)
+ {
+ 	char *filename = *((char **) arg);
+@@ -409,6 +410,9 @@ static void php_load_zend_extension_cb(void *arg)
+ 		efree(libpath);
+ 	}
+ }
++#else
++static void php_load_zend_extension_cb(void *arg) { }
++#endif
+ /* }}} */
+ 
+ /* {{{ php_init_config
+-- 
+2.14.3
+
Signature · 1 line
2.14.3
#1 lore raw

PATCH 2/2 php: disable on configurations using BR2_BINFMT_FLAT

BR2_BINFMT_FLAT configurations require the use of elf2flt. However, PHP uses -export-dynamic which breaks badly with elf2flt. Even a simple program fails to build:

$ ./output/host/bin/arm-linux-gcc -Wl,-export-dynamic -o toto toto.c
/home/thomas/projets/buildroot/output/host/opt/ext-toolchain/arm-buildroot-uclinux-uclibcgnueabi/bin/ld.real: section .junk LMA [0000000000000000,0000000000000027] overlaps section .text LMA [0000000000000000,0000000000006d07]

-export-dynamic is clearly not useful for FLAT configurations, which are always statically linked, but it's quite a bit of work to change the PHP build system to use it only conditionall.

It looks more like an interaction bug between gcc (which wants to put the .text section at address 0x0 in its linker script) and elf2flt, which wants to put its .junk section (containing the .rel.text stuff) also at address 0x0.

Fixes (works around) the "section overlap" part of:

http://autobuild.buildroot.net/results/35cbed8927bb10500ecf2816aa728ea240a0be21/

Cc Waldemar Brodkorb <[email protected]>
---
 package/php/Config.in | 4 ++++
 1 file changed, 4 insertions(+)
package/php/Config.in +4 -0
index 0fb80063af..11514e04b1 100644
@@ -6,6 +6,10 @@ config BR2_PACKAGE_PHP
 	       !BR2_PACKAGE_PHP_SAPI_FPM &&  \
 	       BR2_USE_MMU
 	select BR2_PACKAGE_PHP_SAPI_CLI if !BR2_USE_MMU
+	# PHP uses -export-dynamic, which breaks with elf2flt with a
+	# message like "ld.real: section .junk LMA [...,...] overlaps
+	# section .text LMA [...,...]"
+	depends on !BR2_BINFMT_FLAT
 	help
 	  PHP  is a widely-used general-purpose scripting
 	  language that is especially suited for Web development
Signature · 1 line
2.14.3
#2 lore raw

PATCH 2/2 php: disable on configurations using BR2_BINFMT_FLAT

Quoted 18 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

BR2_BINFMT_FLAT configurations require the use of elf2flt. However, PHP uses -export-dynamic which breaks badly with elf2flt. Even a simple program fails to build:

$ ./output/host/bin/arm-linux-gcc -Wl,-export-dynamic -o toto toto.c
/home/thomas/projets/buildroot/output/host/opt/ext-toolchain/arm-buildroot-uclinux-uclibcgnueabi/bin/ld.real: section .junk LMA [0000000000000000,0000000000000027] overlaps section .text LMA [0000000000000000,0000000000006d07]

-export-dynamic is clearly not useful for FLAT configurations, which are always statically linked, but it's quite a bit of work to change the PHP build system to use it only conditionall.

It looks more like an interaction bug between gcc (which wants to put the .text section at address 0x0 in its linker script) and elf2flt, which wants to put its .junk section (containing the .rel.text stuff) also at address 0x0.

Quoted 6 lines

Fixes (works around) the "section overlap" part of:

http://autobuild.buildroot.net/results/35cbed8927bb10500ecf2816aa728ea240a0be21/

Cc Waldemar Brodkorb <[email protected]>

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#3 lore raw

PATCH 1/2 php: add patch to fix build on static-only systems

In reply to Thomas Petazzoni
Quoted 10 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

This commit adds a patch to PHP to fix the build on static-only system, a regression introduced in PHP recently.

Fixes:

http://autobuild.buildroot.net/results/fbf7ebbb9502424727006f39e169ec1ee870186d/

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard