From: Mingli Yu <[email protected]>
Rebase 2 patches to new version and enable openssl PACKAGECONFIG
as OpenSSL 3.0 is now supported in the new version [1].
[1]
https://github.com/php/php-src/commit/7b34db0659dda933b1146a0ff249f25acca1d669
Signed-off-by: Mingli Yu <[email protected]>
---
...ext-opcache-config.m4-enable-opcache.patch | 50 +++++++++++--------
.../0011-use-qemuwrapper-for-minilua.patch | 33 +++++++++---
.../php/{php_8.0.12.bb => php_8.1.0.bb} | 4 +-
3 files changed, 57 insertions(+), 30 deletions(-)
rename meta-oe/recipes-devtools/php/{php_8.0.12.bb => php_8.1.0.bb} (98%)
diff --git
a/meta-oe/recipes-devtools/php/php/0001-ext-opcache-config.m4-enable-opcache.patch
b/meta-oe/recipes-devtools/php/php/0001-ext-opcache-config.m4-enable-opcache.patch
index 44534cc06..a967d6412 100644
---
a/meta-oe/recipes-devtools/php/php/0001-ext-opcache-config.m4-enable-opcache.patch
+++
b/meta-oe/recipes-devtools/php/php/0001-ext-opcache-config.m4-enable-opcache.patch
@@ -1,6 +1,6 @@
-From 8cabcf1043953a0fe48107204a2212609b8e6516 Mon Sep 17 00:00:00 2001
-From: Claude Bing <[email protected]>
-Date: Tue, 9 Nov 2021 12:59:15 -0500
+From ca9b419f2c146061f73ee045cb0a069c18b40cd0 Mon Sep 17 00:00:00 2001
+From: Mingli Yu <[email protected]>
+Date: Wed, 15 Dec 2021 14:00:08 +0800
Subject: [PATCH 01/11] ext/opcache/config.m4: enable opcache
We can't use AC_TRY_RUN to run programs in a cross compile
@@ -17,15 +17,18 @@ Signed-off-by: Changqing Li <[email protected]>
update patch to version 8.0.12
fix issue linking with librt
Signed-off-by: Claude Bing <[email protected]>
+
+update patch to version 8.1.0
+Signed-off-by: Mingli Yu <[email protected]>
---
- ext/opcache/config.m4 | 197 ++----------------------------------------
- 1 file changed, 8 insertions(+), 189 deletions(-)
+ ext/opcache/config.m4 | 204 ++----------------------------------------
+ 1 file changed, 8 insertions(+), 196 deletions(-)
diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4
-index 5492fd920c..95158ccfd9 100644
+index 2a83fa2..9471b5d 100644
--- a/ext/opcache/config.m4
+++ b/ext/opcache/config.m4
-@@ -101,202 +101,21 @@ if test "$PHP_OPCACHE" != "no"; then
+@@ -108,209 +108,21 @@ if test "$PHP_OPCACHE" != "no"; then
AC_CHECK_FUNCS([mprotect])
AC_MSG_CHECKING(for sysvipc shared memory support)
@@ -93,9 +96,10 @@ index 5492fd920c..95158ccfd9 100644
- }
- return 0;
-}
--]])],[dnl
+-]])],[have_shm_ipc=yes],[have_shm_ipc=no],[have_shm_ipc=no])
+- if test "$have_shm_ipc" = "yes"; then
- AC_DEFINE(HAVE_SHM_IPC, 1, [Define if you have SysV IPC SHM support])
-- have_shm_ipc=yes],[have_shm_ipc=no],[have_shm_ipc=no])
+- fi
+ AC_DEFINE(HAVE_SHM_IPC, 1, [Define if you have SysV IPC SHM support])
+ have_shm_ipc=yes
AC_MSG_RESULT([$have_shm_ipc])
@@ -147,9 +151,19 @@ index 5492fd920c..95158ccfd9 100644
- }
- return 0;
-}
--]])],[dnl
+-]])],[have_shm_mmap_anon=yes],[have_shm_mmap_anon=no],[
+- case $host_alias in
+- *linux*)
+- have_shm_mmap_anon=yes
+- ;;
+- *)
+- have_shm_mmap_anon=no
+- ;;
+- esac
+-])
+- if test "$have_shm_mmap_anon" = "yes"; then
- AC_DEFINE(HAVE_SHM_MMAP_ANON, 1, [Define if you have mmap(MAP_ANON) SHM
support])
-- have_shm_mmap_anon=yes],[have_shm_mmap_anon=no],[have_shm_mmap_anon=no])
+- fi
+ AC_DEFINE(HAVE_SHM_MMAP_ANON, 1, [Define if you have mmap(MAP_ANON) SHM
support])
+ have_shm_mmap_anon=yes
AC_MSG_RESULT([$have_shm_mmap_anon])
@@ -219,16 +233,12 @@ index 5492fd920c..95158ccfd9 100644
- }
- return 0;
-}
--]])],[dnl
+-]])],[have_shm_mmap_posix=yes],[have_shm_mmap_posix=no],[have_shm_mmap_posix=no])
+- if test "$have_shm_mmap_posix" = "yes"; then
- AC_DEFINE(HAVE_SHM_MMAP_POSIX, 1, [Define if you have POSIX mmap() SHM
support])
-- AC_MSG_RESULT([yes])
-- have_shm_mmap_posix=yes
- PHP_CHECK_LIBRARY(rt, shm_unlink,
[PHP_ADD_LIBRARY(rt,1,OPCACHE_SHARED_LIBADD)])
-- ],[
-- AC_MSG_RESULT([no])
-- ],[
-- AC_MSG_RESULT([no])
-- ])
+- fi
+- AC_MSG_RESULT([$have_shm_mmap_posix])
+ AC_DEFINE(HAVE_SHM_MMAP_POSIX, 1, [Define if you have POSIX mmap() SHM
support])
+ AC_MSG_RESULT([yes])
+ have_shm_mmap_posix=yes
@@ -237,5 +247,5 @@ index 5492fd920c..95158ccfd9 100644
PHP_NEW_EXTENSION(opcache,
ZendAccelerator.c \
--
-2.25.1
+2.17.1
diff --git
a/meta-oe/recipes-devtools/php/php/0011-use-qemuwrapper-for-minilua.patch
b/meta-oe/recipes-devtools/php/php/0011-use-qemuwrapper-for-minilua.patch
index 892a0460c..52d5c6696 100644
--- a/meta-oe/recipes-devtools/php/php/0011-use-qemuwrapper-for-minilua.patch
+++ b/meta-oe/recipes-devtools/php/php/0011-use-qemuwrapper-for-minilua.patch
@@ -1,11 +1,28 @@
---- a/ext/opcache/jit/Makefile.frag 2021-10-19 06:34:32.000000000 -0400
-+++ b/ext/opcache/jit/Makefile.frag 2021-11-15 15:10:41.437289836 -0500
-@@ -3,7 +3,7 @@ $(builddir)/minilua: $(srcdir)/jit/dynas
- $(CC) $(srcdir)/jit/dynasm/minilua.c -lm -o $@
+From 0f7b9264c5130b3ca0a20d326fb13ca8fc0a9969 Mon Sep 17 00:00:00 2001
+From: Mingli Yu <[email protected]>
+Date: Wed, 15 Dec 2021 14:43:45 +0800
+Subject: [PATCH] use qemuwrapper for minilua
+
+update to 8.1.0
+
+Signed-off-by: Mingli Yu <[email protected]>
+---
+ ext/opcache/jit/Makefile.frag | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ext/opcache/jit/Makefile.frag b/ext/opcache/jit/Makefile.frag
+index 98c5cda..fb0e6f0 100644
+--- a/ext/opcache/jit/Makefile.frag
++++ b/ext/opcache/jit/Makefile.frag
+@@ -3,7 +3,7 @@ $(builddir)/minilua: $(srcdir)/jit/dynasm/minilua.c
+ $(BUILD_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
-+ $(top_srcdir)/qemuwrapper $(builddir)/minilua
$(srcdir)/jit/dynasm/dynasm.lua $(DASM_FLAGS) -o $@
$(srcdir)/jit/zend_jit_x86.dasc
+ $(builddir)/jit/zend_jit_$(DASM_ARCH).c:
$(srcdir)/jit/zend_jit_$(DASM_ARCH).dasc $(srcdir)/jit/dynasm/*.lua
$(builddir)/minilua
+- $(builddir)/minilua $(srcdir)/jit/dynasm/dynasm.lua $(DASM_FLAGS) -o
$@ $(srcdir)/jit/zend_jit_$(DASM_ARCH).dasc
++ $(top_srcdir)/qemuwrapper $(builddir)/minilua
$(srcdir)/jit/dynasm/dynasm.lua $(DASM_FLAGS) -o $@
$(srcdir)/jit/zend_jit_$(DASM_ARCH).dasc
$(builddir)/jit/zend_jit.lo: \
- $(builddir)/jit/zend_jit_x86.c \
+ $(builddir)/jit/zend_jit_$(DASM_ARCH).c \
+--
+2.17.1
+
diff --git a/meta-oe/recipes-devtools/php/php_8.0.12.bb
b/meta-oe/recipes-devtools/php/php_8.1.0.bb
similarity index 98%
rename from meta-oe/recipes-devtools/php/php_8.0.12.bb
rename to meta-oe/recipes-devtools/php/php_8.1.0.bb
index 38771948f..29e124acf 100644
--- a/meta-oe/recipes-devtools/php/php_8.0.12.bb
+++ b/meta-oe/recipes-devtools/php/php_8.1.0.bb
@@ -33,7 +33,7 @@ SRC_URI:append:class-target = " \
"
S = "${WORKDIR}/php-${PV}"
-SRC_URI[sha256sum] =
"b4886db1df322dc8fb128d8b34ae7e94f6fc682ecb29ff4f5a591d4de9feadbf"
+SRC_URI[sha256sum] =
"0725ed2baea125496a898455d501a77460218b2a0cfad773fa9322f491b82b61"
inherit autotools pkgconfig python3native gettext qemu
@@ -77,7 +77,7 @@ EXTRA_OECONF:class-native = " \
${COMMON_EXTRA_OECONF} \
"
-PACKAGECONFIG ??= "mysql sqlite3 imap opcache \
+PACKAGECONFIG ??= "mysql sqlite3 imap opcache openssl \
${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 pam', d)} \
"
PACKAGECONFIG:class-native = ""
--
2.17.1
