From ce3a46e874bebbe3b67d9d1fa1246622c7508c46 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 11 Nov 2021 08:32:58 -0800 Subject: [PATCH] php: Build minilua for build host see https://bugs.php.net/bug.php?id=80717&edit=1 Signed-off-by: Khem Raj --- ...1-opcache-jit-use-minilua-in-sysroot.patch | 29 ------------------- ...10-Fix-opcache-jit-minilua-compiling.patch | 20 +++++++++++++ meta-oe/recipes-devtools/php/php_8.0.12.bb | 8 ++--- 3 files changed, 22 insertions(+), 35 deletions(-) delete mode 100644 meta-oe/recipes-devtools/php/php/0011-opcache-jit-use-minilua-in-sysroot.patch create mode 100644 meta-oe/recipes-devtools/php/php/1010-Fix-opcache-jit-minilua-compiling.patch diff --git a/meta-oe/recipes-devtools/php/php/0011-opcache-jit-use-minilua-in-sysroot.patch b/meta-oe/recipes-devtools/php/php/0011-opcache-jit-use-minilua-in-sysroot.patch deleted file mode 100644 index 2ba0f2b7714..00000000000 --- a/meta-oe/recipes-devtools/php/php/0011-opcache-jit-use-minilua-in-sysroot.patch +++ /dev/null @@ -1,29 +0,0 @@ -From aaa6a81cfb20f9b3c25aa22e5a472c0f2867f72c Mon Sep 17 00:00:00 2001 -From: Claude Bing -Date: Tue, 9 Nov 2021 13:11:42 -0500 -Subject: [PATCH 11/11] opcache/jit: use minilua in sysroot - -Signed-off-by: Claude Bing ---- - ext/opcache/jit/Makefile.frag | 7 ++----- - 1 file changed, 2 insertions(+), 5 deletions(-) - -diff --git a/ext/opcache/jit/Makefile.frag b/ext/opcache/jit/Makefile.frag -index b3af5b290a..f2e737e463 100644 ---- a/ext/opcache/jit/Makefile.frag -+++ b/ext/opcache/jit/Makefile.frag -@@ -1,9 +1,6 @@ - --$(builddir)/minilua: $(srcdir)/jit/dynasm/minilua.c -- $(CC) $(srcdir)/jit/dynasm/minilua.c -lm -o $@ -- --$(builddir)/jit/zend_jit_x86.c: $(srcdir)/jit/zend_jit_x86.dasc $(srcdir)/jit/dynasm/*.lua $(builddir)/minilua -- $(builddir)/minilua $(srcdir)/jit/dynasm/dynasm.lua $(DASM_FLAGS) -o $@ $(srcdir)/jit/zend_jit_x86.dasc -+$(builddir)/jit/zend_jit_x86.c: $(srcdir)/jit/zend_jit_x86.dasc $(srcdir)/jit/dynasm/*.lua -+ @minilua $(srcdir)/jit/dynasm/dynasm.lua $(DASM_FLAGS) -o $@ $(srcdir)/jit/zend_jit_x86.dasc - - $(builddir)/jit/zend_jit.lo: \ - $(builddir)/jit/zend_jit_x86.c \ --- -2.25.1 - diff --git a/meta-oe/recipes-devtools/php/php/1010-Fix-opcache-jit-minilua-compiling.patch b/meta-oe/recipes-devtools/php/php/1010-Fix-opcache-jit-minilua-compiling.patch new file mode 100644 index 00000000000..6f134fabb86 --- /dev/null +++ b/meta-oe/recipes-devtools/php/php/1010-Fix-opcache-jit-minilua-compiling.patch @@ -0,0 +1,20 @@ +From 73ea1d44c1e6b063bfa02e12919ec8a9de3709d8 Mon Sep 17 00:00:00 2001 +From: Michael Heimpold +Date: Wed, 3 Feb 2021 22:51:34 +0100 +Subject: [PATCH] Fix opcache jit minilua compiling + +Signed-off-by: Michael Heimpold +--- + ext/opcache/jit/Makefile.frag | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/ext/opcache/jit/Makefile.frag ++++ b/ext/opcache/jit/Makefile.frag +@@ -1,6 +1,6 @@ + + $(builddir)/minilua: $(srcdir)/jit/dynasm/minilua.c +- $(CC) $(srcdir)/jit/dynasm/minilua.c -lm -o $@ ++ $(HOSTCC) $(srcdir)/jit/dynasm/minilua.c -lm -o $@ + + $(builddir)/jit/zend_jit_x86.c: $(srcdir)/jit/zend_jit_x86.dasc $(srcdir)/jit/dynasm/*.lua $(builddir)/minilua + $(builddir)/minilua $(srcdir)/jit/dynasm/dynasm.lua $(DASM_FLAGS) -o $@ $(srcdir)/jit/zend_jit_x86.dasc diff --git a/meta-oe/recipes-devtools/php/php_8.0.12.bb b/meta-oe/recipes-devtools/php/php_8.0.12.bb index 300499de5c2..8d24c187efb 100644 --- a/meta-oe/recipes-devtools/php/php_8.0.12.bb +++ b/meta-oe/recipes-devtools/php/php_8.0.12.bb @@ -25,7 +25,7 @@ SRC_URI:append:class-target = " \ file://0006-ext-phar-Makefile.frag-Fix-phar-packaging.patch \ file://0007-sapi-cli-config.m4-fix-build-directory.patch \ file://0008-ext-imap-config.m4-fix-include-paths.patch \ - file://0011-opcache-jit-use-minilua-in-sysroot.patch \ + file://1010-Fix-opcache-jit-minilua-compiling.patch \ file://php-fpm.conf \ file://php-fpm-apache.conf \ file://70_mod_php${PHP_MAJOR_VERSION}.conf \ @@ -108,6 +108,7 @@ PACKAGECONFIG[valgrind] = "--with-valgrind=${STAGING_DIR_TARGET}/usr,--with-valg PACKAGECONFIG[mbregex] = "--enable-mbregex, --disable-mbregex, oniguruma" PACKAGECONFIG[mbstring] = "--enable-mbstring,," +export HOSTCC = "${BUILD_CC}" export PHP_NATIVE_DIR = "${STAGING_BINDIR_NATIVE}" export PHP_PEAR_PHP_BIN = "${STAGING_BINDIR_NATIVE}/php" CFLAGS += " -D_GNU_SOURCE -g -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED -I${STAGING_INCDIR}/apache2" @@ -258,13 +259,8 @@ RCONFLICTS:${PN}-modphp = "${MODPHP_OLDPACKAGE}" do_install:append:class-native() { create_wrapper ${D}${bindir}/php \ PHP_PEAR_SYSCONF_DIR=${sysconfdir}/ - - if [ "$MACHINE_ARCH" == "x86" || "$MACHINE_ARCH" == "x86-64" ]; then - install -m 0755 ${WORKDIR}/build/ext/opcache/minilua ${D}${bindir}/ - fi } - # Fails to build with thumb-1 (qemuarm) # | {standard input}: Assembler messages: # | {standard input}:3719: Error: selected processor does not support Thumb mode `smull r0,r2,r9,r3'