summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta-oe/recipes-devtools/php/php/0001-ext-opcache-config.m4-enable-opcache.patch (renamed from meta-oe/recipes-devtools/php/php/0001-opcache-config.m4-enable-opcache.patch)46
-rw-r--r--meta-oe/recipes-devtools/php/php/0002-build-php.m4-don-t-unset-cache-variables.patch (renamed from meta-oe/recipes-devtools/php/php/0001-php.m4-don-t-unset-cache-variables.patch)16
-rw-r--r--meta-oe/recipes-devtools/php/php/0003-php-remove-host-specific-info-from-header-file.patch (renamed from meta-oe/recipes-devtools/php/php/debian-php-fixheader.patch)22
-rw-r--r--meta-oe/recipes-devtools/php/php/0004-configure.ac-don-t-include-build-libtool.m4.patch (renamed from meta-oe/recipes-devtools/php/php/0001-configure.ac-don-t-include-build-libtool.m4.patch)15
-rw-r--r--meta-oe/recipes-devtools/php/php/0005-pear-fix-Makefile.frag-for-Yocto.patch (renamed from meta-oe/recipes-devtools/php/php/pear-makefile.patch)19
-rw-r--r--meta-oe/recipes-devtools/php/php/0006-ext-phar-Makefile.frag-Fix-phar-packaging.patch (renamed from meta-oe/recipes-devtools/php/php/phar-makefile.patch)15
-rw-r--r--meta-oe/recipes-devtools/php/php/0007-sapi-cli-config.m4-fix-build-directory.patch (renamed from meta-oe/recipes-devtools/php/php/php_exec_native.patch)16
-rw-r--r--meta-oe/recipes-devtools/php/php/0008-ext-imap-config.m4-fix-include-paths.patch (renamed from meta-oe/recipes-devtools/php/php/imap-fix-autofoo.patch)18
-rw-r--r--meta-oe/recipes-devtools/php/php/0009-php-don-t-use-broken-wrapper-for-mkdir.patch (renamed from meta-oe/recipes-devtools/php/php/0001-php-don-t-use-broken-wrapper-for-mkdir.patch)18
-rw-r--r--meta-oe/recipes-devtools/php/php/0010-iconv-fix-detection.patch35
-rw-r--r--meta-oe/recipes-devtools/php/php/0011-opcache-jit-use-minilua-in-sysroot.patch29
-rw-r--r--meta-oe/recipes-devtools/php/php/70_mod_php8.conf (renamed from meta-oe/recipes-devtools/php/php/70_mod_php7.conf)2
-rw-r--r--meta-oe/recipes-devtools/php/php/iconv.patch41
-rw-r--r--meta-oe/recipes-devtools/php/php/xfail_two_bug_tests.patch34
-rw-r--r--meta-oe/recipes-devtools/php/php_8.0.12.bb (renamed from meta-oe/recipes-devtools/php/php_7.4.21.bb)28
15 files changed, 193 insertions, 161 deletions
diff --git a/meta-oe/recipes-devtools/php/php/0001-opcache-config.m4-enable-opcache.patch b/meta-oe/recipes-devtools/php/php/0001-ext-opcache-config.m4-enable-opcache.patch
index 1f3e683a0f..44534cc062 100644
--- a/meta-oe/recipes-devtools/php/php/0001-opcache-config.m4-enable-opcache.patch
+++ b/meta-oe/recipes-devtools/php/php/0001-ext-opcache-config.m4-enable-opcache.patch
@@ -1,13 +1,11 @@
1From a74b42098aededd296ec6a3cd4cf5a17e59d6f29 Mon Sep 17 00:00:00 2001 1From 8cabcf1043953a0fe48107204a2212609b8e6516 Mon Sep 17 00:00:00 2001
2From: Claude Bing <cbing@cybernetics.com> 2From: Claude Bing <cbing@cybernetics.com>
3Date: Fri, 8 May 2020 10:15:32 -0400 3Date: Tue, 9 Nov 2021 12:59:15 -0500
4Subject: [PATCH] opcache/config.m4: enable opcache 4Subject: [PATCH 01/11] ext/opcache/config.m4: enable opcache
5 5
6We can't use AC_TRY_RUN to run programs in a cross compile environment. 6We can't use AC_TRY_RUN to run programs in a cross compile
7Set 7environment. Set the variables directly instead since we know
8the variables directly instead since we know that we'd be running on 8that we'd be running on latest enough linux kernel.
9latest
10enough linux kernel.
11 9
12Upstream-Status: Inappropriate [Configuration] 10Upstream-Status: Inappropriate [Configuration]
13 11
@@ -16,17 +14,18 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
16update patch to version 7.4.4 14update patch to version 7.4.4
17Signed-off-by: Changqing Li <changqing.li@windriver.com> 15Signed-off-by: Changqing Li <changqing.li@windriver.com>
18 16
17update patch to version 8.0.12
19fix issue linking with librt 18fix issue linking with librt
20Signed-off-by: Claude Bing <cbing@cybernetics.com> 19Signed-off-by: Claude Bing <cbing@cybernetics.com>
21--- 20---
22 ext/opcache/config.m4 | 195 +----------------------------------------- 21 ext/opcache/config.m4 | 197 ++----------------------------------------
23 1 file changed, 4 insertions(+), 191 deletions(-) 22 1 file changed, 8 insertions(+), 189 deletions(-)
24 23
25diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4 24diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4
26index 6c40cafc1c..6569aa9e1c 100644 25index 5492fd920c..95158ccfd9 100644
27--- a/ext/opcache/config.m4 26--- a/ext/opcache/config.m4
28+++ b/ext/opcache/config.m4 27+++ b/ext/opcache/config.m4
29@@ -23,201 +23,14 @@ if test "$PHP_OPCACHE" != "no"; then 28@@ -101,202 +101,21 @@ if test "$PHP_OPCACHE" != "no"; then
30 AC_CHECK_FUNCS([mprotect]) 29 AC_CHECK_FUNCS([mprotect])
31 30
32 AC_MSG_CHECKING(for sysvipc shared memory support) 31 AC_MSG_CHECKING(for sysvipc shared memory support)
@@ -96,9 +95,10 @@ index 6c40cafc1c..6569aa9e1c 100644
96-} 95-}
97-]])],[dnl 96-]])],[dnl
98- AC_DEFINE(HAVE_SHM_IPC, 1, [Define if you have SysV IPC SHM support]) 97- AC_DEFINE(HAVE_SHM_IPC, 1, [Define if you have SysV IPC SHM support])
99- msg=yes],[msg=no],[msg=no]) 98- have_shm_ipc=yes],[have_shm_ipc=no],[have_shm_ipc=no])
100- AC_MSG_RESULT([$msg])
101+ AC_DEFINE(HAVE_SHM_IPC, 1, [Define if you have SysV IPC SHM support]) 99+ AC_DEFINE(HAVE_SHM_IPC, 1, [Define if you have SysV IPC SHM support])
100+ have_shm_ipc=yes
101 AC_MSG_RESULT([$have_shm_ipc])
102 102
103 AC_MSG_CHECKING(for mmap() using MAP_ANON shared memory support) 103 AC_MSG_CHECKING(for mmap() using MAP_ANON shared memory support)
104- AC_RUN_IFELSE([AC_LANG_SOURCE([[ 104- AC_RUN_IFELSE([AC_LANG_SOURCE([[
@@ -116,8 +116,7 @@ index 6c40cafc1c..6569aa9e1c 100644
116-#ifndef MAP_FAILED 116-#ifndef MAP_FAILED
117-# define MAP_FAILED ((void*)-1) 117-# define MAP_FAILED ((void*)-1)
118-#endif 118-#endif
119+ AC_DEFINE(HAVE_SHM_MMAP_ANON, 1, [Define if you have mmap(MAP_ANON) SHM support]) 119-
120
121-int main() { 120-int main() {
122- pid_t pid; 121- pid_t pid;
123- int status; 122- int status;
@@ -150,10 +149,12 @@ index 6c40cafc1c..6569aa9e1c 100644
150-} 149-}
151-]])],[dnl 150-]])],[dnl
152- AC_DEFINE(HAVE_SHM_MMAP_ANON, 1, [Define if you have mmap(MAP_ANON) SHM support]) 151- AC_DEFINE(HAVE_SHM_MMAP_ANON, 1, [Define if you have mmap(MAP_ANON) SHM support])
153- msg=yes],[msg=no],[msg=no]) 152- have_shm_mmap_anon=yes],[have_shm_mmap_anon=no],[have_shm_mmap_anon=no])
154- AC_MSG_RESULT([$msg]) 153+ AC_DEFINE(HAVE_SHM_MMAP_ANON, 1, [Define if you have mmap(MAP_ANON) SHM support])
155- 154+ have_shm_mmap_anon=yes
156- PHP_CHECK_FUNC_LIB(shm_open, rt) 155 AC_MSG_RESULT([$have_shm_mmap_anon])
156
157 PHP_CHECK_FUNC_LIB(shm_open, rt, root)
157 AC_MSG_CHECKING(for mmap() using shm_open() shared memory support) 158 AC_MSG_CHECKING(for mmap() using shm_open() shared memory support)
158- AC_RUN_IFELSE([AC_LANG_SOURCE([[ 159- AC_RUN_IFELSE([AC_LANG_SOURCE([[
159-#include <sys/types.h> 160-#include <sys/types.h>
@@ -221,6 +222,7 @@ index 6c40cafc1c..6569aa9e1c 100644
221-]])],[dnl 222-]])],[dnl
222- AC_DEFINE(HAVE_SHM_MMAP_POSIX, 1, [Define if you have POSIX mmap() SHM support]) 223- AC_DEFINE(HAVE_SHM_MMAP_POSIX, 1, [Define if you have POSIX mmap() SHM support])
223- AC_MSG_RESULT([yes]) 224- AC_MSG_RESULT([yes])
225- have_shm_mmap_posix=yes
224- PHP_CHECK_LIBRARY(rt, shm_unlink, [PHP_ADD_LIBRARY(rt,1,OPCACHE_SHARED_LIBADD)]) 226- PHP_CHECK_LIBRARY(rt, shm_unlink, [PHP_ADD_LIBRARY(rt,1,OPCACHE_SHARED_LIBADD)])
225- ],[ 227- ],[
226- AC_MSG_RESULT([no]) 228- AC_MSG_RESULT([no])
@@ -228,10 +230,12 @@ index 6c40cafc1c..6569aa9e1c 100644
228- AC_MSG_RESULT([no]) 230- AC_MSG_RESULT([no])
229- ]) 231- ])
230+ AC_DEFINE(HAVE_SHM_MMAP_POSIX, 1, [Define if you have POSIX mmap() SHM support]) 232+ AC_DEFINE(HAVE_SHM_MMAP_POSIX, 1, [Define if you have POSIX mmap() SHM support])
233+ AC_MSG_RESULT([yes])
234+ have_shm_mmap_posix=yes
231+ PHP_CHECK_LIBRARY(rt, shm_unlink, [PHP_ADD_LIBRARY(rt,1,OPCACHE_SHARED_LIBADD)]) 235+ PHP_CHECK_LIBRARY(rt, shm_unlink, [PHP_ADD_LIBRARY(rt,1,OPCACHE_SHARED_LIBADD)])
232 236
233 PHP_NEW_EXTENSION(opcache, 237 PHP_NEW_EXTENSION(opcache,
234 ZendAccelerator.c \ 238 ZendAccelerator.c \
235-- 239--
2362.17.1 2402.25.1
237 241
diff --git a/meta-oe/recipes-devtools/php/php/0001-php.m4-don-t-unset-cache-variables.patch b/meta-oe/recipes-devtools/php/php/0002-build-php.m4-don-t-unset-cache-variables.patch
index 0d721ec506..6183f49c28 100644
--- a/meta-oe/recipes-devtools/php/php/0001-php.m4-don-t-unset-cache-variables.patch
+++ b/meta-oe/recipes-devtools/php/php/0002-build-php.m4-don-t-unset-cache-variables.patch
@@ -1,4 +1,7 @@
1php.m4: don't unset cache variables 1From 1af203e8e385d46ad3e33b1c253b1c564aa99034 Mon Sep 17 00:00:00 2001
2From: Claude Bing <cbing@cybernetics.com>
3Date: Tue, 9 Nov 2021 13:01:55 -0500
4Subject: [PATCH 02/11] build/php.m4: don't unset cache variables
2 5
3Unsetting prevents cache variable from being passed to configure. 6Unsetting prevents cache variable from being passed to configure.
4 7
@@ -8,15 +11,18 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
8 11
9update this patch to 7.4.4, acinclude.m4 move to build/php.m4 12update this patch to 7.4.4, acinclude.m4 move to build/php.m4
10Signed-off-by: Changqing Li <changqing.li@windriver.com> 13Signed-off-by: Changqing Li <changqing.li@windriver.com>
14
15update patch to 8.0.12
16Signed-off-by: Claude Bing <cbing@cybernetics.com>
11--- 17---
12 build/php.m4 | 4 ---- 18 build/php.m4 | 4 ----
13 1 file changed, 4 deletions(-) 19 1 file changed, 4 deletions(-)
14 20
15diff --git a/build/php.m4 b/build/php.m4 21diff --git a/build/php.m4 b/build/php.m4
16index 5c45d13..218ec47 100644 22index 9746ba28f3..93551d9ca7 100644
17--- a/build/php.m4 23--- a/build/php.m4
18+++ b/build/php.m4 24+++ b/build/php.m4
19@@ -1587,8 +1587,6 @@ dnl PHP_CHECK_FUNC_LIB 25@@ -1568,8 +1568,6 @@ dnl PHP_CHECK_FUNC_LIB
20 dnl 26 dnl
21 AC_DEFUN([PHP_CHECK_FUNC_LIB],[ 27 AC_DEFUN([PHP_CHECK_FUNC_LIB],[
22 ifelse($2,,:,[ 28 ifelse($2,,:,[
@@ -25,7 +31,7 @@ index 5c45d13..218ec47 100644
25 unset found 31 unset found
26 AC_CHECK_LIB($2, $1, [found=yes], [ 32 AC_CHECK_LIB($2, $1, [found=yes], [
27 AC_CHECK_LIB($2, __$1, [found=yes], [found=no]) 33 AC_CHECK_LIB($2, __$1, [found=yes], [found=no])
28@@ -1620,8 +1618,6 @@ dnl and as a fall back in the specified library. Defines HAVE_func and 34@@ -1601,8 +1599,6 @@ dnl and as a fall back in the specified library. Defines HAVE_func and
29 dnl HAVE_library if found and adds the library to LIBS. 35 dnl HAVE_library if found and adds the library to LIBS.
30 dnl 36 dnl
31 AC_DEFUN([PHP_CHECK_FUNC],[ 37 AC_DEFUN([PHP_CHECK_FUNC],[
@@ -35,5 +41,5 @@ index 5c45d13..218ec47 100644
35 41
36 AC_CHECK_FUNC($1, [found=yes],[ AC_CHECK_FUNC(__$1,[found=yes],[found=no]) ]) 42 AC_CHECK_FUNC($1, [found=yes],[ AC_CHECK_FUNC(__$1,[found=yes],[found=no]) ])
37-- 43--
382.7.4 442.25.1
39 45
diff --git a/meta-oe/recipes-devtools/php/php/debian-php-fixheader.patch b/meta-oe/recipes-devtools/php/php/0003-php-remove-host-specific-info-from-header-file.patch
index a4804d1849..9637ed9516 100644
--- a/meta-oe/recipes-devtools/php/php/debian-php-fixheader.patch
+++ b/meta-oe/recipes-devtools/php/php/0003-php-remove-host-specific-info-from-header-file.patch
@@ -1,26 +1,30 @@
1From 1234a8ef7c5ab88e24bc5908f0ccfd55af21aa39 Mon Sep 17 00:00:00 2001 1From c81d0bd3491a6c6371d9df2f43956d109f984310 Mon Sep 17 00:00:00 2001
2From: Leon Anavi <leon.anavi@konsulko.com> 2From: Claude Bing <cbing@cybernetics.com>
3Date: Mon, 31 Aug 2020 16:03:27 +0300 3Date: Tue, 9 Nov 2021 13:02:29 -0500
4Subject: [PATCH] php: remove host specific info from header file 4Subject: [PATCH 03/11] php: remove host specific info from header file
5 5
6Based on: 6Based on:
7https://sources.debian.org/data/main/p/php7.3/7.3.6-1/debian/patches/ 7https://sources.debian.org/data/main/p/php7.3/7.3.6-1/debian/patches/
8 0036-php-5.4.9-fixheader.patch 8 0036-php-5.4.9-fixheader.patch
9 9
10Upstream-Status: Inappropriate [not author] 10Upstream-Status: Inappropriate [not author]
11
11Signed-off-by: Joe Slater <joe.slater@windriver.com> 12Signed-off-by: Joe Slater <joe.slater@windriver.com>
12Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> 13Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
14
15update patch to 8.0.12
16Signed-off-by: Claude Bing <cbing@cybernetics.com>
13--- 17---
14 configure.ac | 2 +- 18 configure.ac | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-) 19 1 file changed, 1 insertion(+), 1 deletion(-)
16 20
17diff --git a/configure.ac b/configure.ac 21diff --git a/configure.ac b/configure.ac
18index 2a474ba36d..6d22a21630 100644 22index 1eafd62a44..90c94323aa 100644
19--- a/configure.ac 23--- a/configure.ac
20+++ b/configure.ac 24+++ b/configure.ac
21@@ -1323,7 +1323,7 @@ PHP_BUILD_DATE=`date -u +%Y-%m-%d` 25@@ -1289,7 +1289,7 @@ PHP_REMOVE_USR_LIB(LDFLAGS)
22 fi 26 EXTRA_LDFLAGS="$EXTRA_LDFLAGS $PHP_LDFLAGS"
23 AC_DEFINE_UNQUOTED(PHP_BUILD_DATE,"$PHP_BUILD_DATE",[PHP build date]) 27 EXTRA_LDFLAGS_PROGRAM="$EXTRA_LDFLAGS_PROGRAM $PHP_LDFLAGS"
24 28
25-UNAME=`uname -a | xargs` 29-UNAME=`uname -a | xargs`
26+UNAME=`uname | xargs` 30+UNAME=`uname | xargs`
@@ -28,5 +32,5 @@ index 2a474ba36d..6d22a21630 100644
28 AC_DEFINE_UNQUOTED(PHP_UNAME,"$PHP_UNAME",[uname -a output]) 32 AC_DEFINE_UNQUOTED(PHP_UNAME,"$PHP_UNAME",[uname -a output])
29 PHP_OS=`uname | xargs` 33 PHP_OS=`uname | xargs`
30-- 34--
312.17.1 352.25.1
32 36
diff --git a/meta-oe/recipes-devtools/php/php/0001-configure.ac-don-t-include-build-libtool.m4.patch b/meta-oe/recipes-devtools/php/php/0004-configure.ac-don-t-include-build-libtool.m4.patch
index 2861366a6b..19a8bf8e4f 100644
--- a/meta-oe/recipes-devtools/php/php/0001-configure.ac-don-t-include-build-libtool.m4.patch
+++ b/meta-oe/recipes-devtools/php/php/0004-configure.ac-don-t-include-build-libtool.m4.patch
@@ -1,7 +1,7 @@
1From f5a34e771532b8433f307b679500c26af328ba35 Mon Sep 17 00:00:00 2001 1From 41ef1121682c245b10df7de4b78c45baf9114c04 Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com> 2From: Claude Bing <cbing@cybernetics.com>
3Date: Fri, 17 Apr 2020 15:01:57 +0800 3Date: Tue, 9 Nov 2021 13:03:46 -0500
4Subject: [PATCH] configure.ac: don't include build/libtool.m4 4Subject: [PATCH 04/11] configure.ac: don't include build/libtool.m4
5 5
6we delete build/libtool.m4 before do_configure, 6we delete build/libtool.m4 before do_configure,
7we will use libtool.m4 under ACLOCALDIR 7we will use libtool.m4 under ACLOCALDIR
@@ -9,12 +9,15 @@ we will use libtool.m4 under ACLOCALDIR
9Upstream-Status: Inappropriate [oe-specific] 9Upstream-Status: Inappropriate [oe-specific]
10 10
11Signed-off-by: Changqing Li <changqing.li@windriver.com> 11Signed-off-by: Changqing Li <changqing.li@windriver.com>
12
13update patch to 8.0.12
14Signed-off-by: Claude Bing <cbing@cybernetics.com>
12--- 15---
13 configure.ac | 1 - 16 configure.ac | 1 -
14 1 file changed, 1 deletion(-) 17 1 file changed, 1 deletion(-)
15 18
16diff --git a/configure.ac b/configure.ac 19diff --git a/configure.ac b/configure.ac
17index 06c6a27..f85144e 100644 20index 90c94323aa..161e7c3f53 100644
18--- a/configure.ac 21--- a/configure.ac
19+++ b/configure.ac 22+++ b/configure.ac
20@@ -6,7 +6,6 @@ dnl ---------------------------------------------------------------------------- 23@@ -6,7 +6,6 @@ dnl ----------------------------------------------------------------------------
@@ -26,5 +29,5 @@ index 06c6a27..f85144e 100644
26 m4_include([build/php.m4]) 29 m4_include([build/php.m4])
27 m4_include([build/pkg.m4]) 30 m4_include([build/pkg.m4])
28-- 31--
292.7.4 322.25.1
30 33
diff --git a/meta-oe/recipes-devtools/php/php/pear-makefile.patch b/meta-oe/recipes-devtools/php/php/0005-pear-fix-Makefile.frag-for-Yocto.patch
index fcbf25be9b..fa956e0284 100644
--- a/meta-oe/recipes-devtools/php/php/pear-makefile.patch
+++ b/meta-oe/recipes-devtools/php/php/0005-pear-fix-Makefile.frag-for-Yocto.patch
@@ -1,17 +1,21 @@
1From edd575a546d56bb5683aff19782b16963d61fd0b Mon Sep 17 00:00:00 2001 1From f22958b4c1348eec3bb4c0f2cbe2d22676e0ad23 Mon Sep 17 00:00:00 2001
2From: Koen Kooi <koen@dominion.thruhere.net> 2From: Claude Bing <cbing@cybernetics.com>
3Date: Wed, 2 Nov 2011 16:54:57 +0100 3Date: Tue, 9 Nov 2021 13:04:29 -0500
4Subject: [PATCH] Upstream-Status: Pending 4Subject: [PATCH 05/11] pear: fix Makefile.frag for Yocto
5 5
6Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
7
8update patch to 8.0.12
9Signed-off-by: Claude Bing <cbing@cybernetics.com>
6--- 10---
7 pear/Makefile.frag | 2 +- 11 pear/Makefile.frag | 2 +-
8 1 file changed, 1 insertion(+), 1 deletion(-) 12 1 file changed, 1 insertion(+), 1 deletion(-)
9 13
10diff --git a/pear/Makefile.frag b/pear/Makefile.frag 14diff --git a/pear/Makefile.frag b/pear/Makefile.frag
11index bbe8ec3..16f43e2 100644 15index 9408757a3a..69072f39e0 100644
12--- a/pear/Makefile.frag 16--- a/pear/Makefile.frag
13+++ b/pear/Makefile.frag 17+++ b/pear/Makefile.frag
14@@ -12,7 +12,7 @@ PEAR_SUFFIX = -ds a$(program_suffix) 18@@ -10,7 +10,7 @@ PEAR_SUFFIX = -ds a$(program_suffix)
15 PEAR_INSTALLER_URL = https://pear.php.net/install-pear-nozlib.phar 19 PEAR_INSTALLER_URL = https://pear.php.net/install-pear-nozlib.phar
16 20
17 install-pear-installer: $(SAPI_CLI_PATH) 21 install-pear-installer: $(SAPI_CLI_PATH)
@@ -20,3 +24,6 @@ index bbe8ec3..16f43e2 100644
20 24
21 install-pear: 25 install-pear:
22 @echo "Installing PEAR environment: $(INSTALL_ROOT)$(peardir)/" 26 @echo "Installing PEAR environment: $(INSTALL_ROOT)$(peardir)/"
27--
282.25.1
29
diff --git a/meta-oe/recipes-devtools/php/php/phar-makefile.patch b/meta-oe/recipes-devtools/php/php/0006-ext-phar-Makefile.frag-Fix-phar-packaging.patch
index eb73bc440e..26872d1204 100644
--- a/meta-oe/recipes-devtools/php/php/phar-makefile.patch
+++ b/meta-oe/recipes-devtools/php/php/0006-ext-phar-Makefile.frag-Fix-phar-packaging.patch
@@ -1,6 +1,7 @@
1Subject: [PATCH] From 08962a56f69963e01892d98ca5b75de8354bd3f5 Mon Sep 17 1From eab5babdadea487bbbef025068c553f5ba741774 Mon Sep 17 00:00:00 2001
2 00:00:00 2001 From: Koen Kooi <koen@dominion.thruhere.net> Date: Wed, 2 Nov 2From: Claude Bing <cbing@cybernetics.com>
3 2011 16:54:57 +0100 Subject: [PATCH] Fix phar packaging 3Date: Tue, 9 Nov 2021 13:07:25 -0500
4Subject: [PATCH 06/11] ext/phar/Makefile.frag: Fix phar packaging
4 5
5Inherited from OE-Classic, with some additions to fix host paths leaking 6Inherited from OE-Classic, with some additions to fix host paths leaking
6into the target package. 7into the target package.
@@ -9,12 +10,16 @@ Upstream-Status: Inappropriate [config]
9 10
10update patch to version 7.4.4 11update patch to version 7.4.4
11Signed-off-by: Changqing Li <changqing.li@windriver.com> 12Signed-off-by: Changqing Li <changqing.li@windriver.com>
13Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
14
15update patch to version 8.0.12
16Signed-off-by: Claude Bing <cbing@cybernetics.com>
12--- 17---
13 ext/phar/Makefile.frag | 17 +++-------------- 18 ext/phar/Makefile.frag | 17 +++--------------
14 1 file changed, 3 insertions(+), 14 deletions(-) 19 1 file changed, 3 insertions(+), 14 deletions(-)
15 20
16diff --git a/ext/phar/Makefile.frag b/ext/phar/Makefile.frag 21diff --git a/ext/phar/Makefile.frag b/ext/phar/Makefile.frag
17index 6442f33..6145412 100644 22index 58789cae25..c02af1b186 100644
18--- a/ext/phar/Makefile.frag 23--- a/ext/phar/Makefile.frag
19+++ b/ext/phar/Makefile.frag 24+++ b/ext/phar/Makefile.frag
20@@ -10,20 +10,9 @@ pharcmd: $(builddir)/phar.php $(builddir)/phar.phar 25@@ -10,20 +10,9 @@ pharcmd: $(builddir)/phar.php $(builddir)/phar.phar
@@ -42,5 +47,5 @@ index 6442f33..6145412 100644
42 $(builddir)/phar/phar.inc: $(srcdir)/phar/phar.inc 47 $(builddir)/phar/phar.inc: $(srcdir)/phar/phar.inc
43 -@test -d $(builddir)/phar || mkdir $(builddir)/phar 48 -@test -d $(builddir)/phar || mkdir $(builddir)/phar
44-- 49--
452.7.4 502.25.1
46 51
diff --git a/meta-oe/recipes-devtools/php/php/php_exec_native.patch b/meta-oe/recipes-devtools/php/php/0007-sapi-cli-config.m4-fix-build-directory.patch
index 4aec4812f6..9776e7f6db 100644
--- a/meta-oe/recipes-devtools/php/php/php_exec_native.patch
+++ b/meta-oe/recipes-devtools/php/php/0007-sapi-cli-config.m4-fix-build-directory.patch
@@ -1,15 +1,21 @@
1Subject: [PATCH] rom d251b5aa3d23803d016ca16818e2e1d2f2b70a02 Mon Sep 17 1From 03aa51625e0d1aa156c2f7cd71503b1f435d35a4 Mon Sep 17 00:00:00 2001
2 00:00:00 2001 From: Koen Kooi <koen@dominion.thruhere.net> Date: Wed, 2 Nov 2From: Claude Bing <cbing@cybernetics.com>
3 2011 16:54:57 +0100 Subject: [PATCH] Upstream-Status: Inappriate 3Date: Tue, 9 Nov 2021 13:08:06 -0500
4Subject: [PATCH 07/11] sapi/cli/config.m4: fix build directory
5
6Upstream-Status: Inappropriate
4 7
5update patch to version 7.4.4 8update patch to version 7.4.4
6Signed-off-by: Changqing Li <changqing.li@windriver.com> 9Signed-off-by: Changqing Li <changqing.li@windriver.com>
10
11update patch to version 8.0.12
12Signed-off-by: Claude Bing <cbing@cybernetics.com>
7--- 13---
8 sapi/cli/config.m4 | 2 +- 14 sapi/cli/config.m4 | 2 +-
9 1 file changed, 1 insertion(+), 1 deletion(-) 15 1 file changed, 1 insertion(+), 1 deletion(-)
10 16
11diff --git a/sapi/cli/config.m4 b/sapi/cli/config.m4 17diff --git a/sapi/cli/config.m4 b/sapi/cli/config.m4
12index 917d45f..aaf1e27 100644 18index d17d531683..f2f87f9164 100644
13--- a/sapi/cli/config.m4 19--- a/sapi/cli/config.m4
14+++ b/sapi/cli/config.m4 20+++ b/sapi/cli/config.m4
15@@ -47,7 +47,7 @@ if test "$PHP_CLI" != "no"; then 21@@ -47,7 +47,7 @@ if test "$PHP_CLI" != "no"; then
@@ -22,5 +28,5 @@ index 917d45f..aaf1e27 100644
22 28
23 dnl Expose to Makefile. 29 dnl Expose to Makefile.
24-- 30--
252.7.4 312.25.1
26 32
diff --git a/meta-oe/recipes-devtools/php/php/imap-fix-autofoo.patch b/meta-oe/recipes-devtools/php/php/0008-ext-imap-config.m4-fix-include-paths.patch
index ebe5f6a93c..78bae58e00 100644
--- a/meta-oe/recipes-devtools/php/php/imap-fix-autofoo.patch
+++ b/meta-oe/recipes-devtools/php/php/0008-ext-imap-config.m4-fix-include-paths.patch
@@ -1,15 +1,19 @@
1Subject: [PATCH] From c084c8349d1780980e232cb28b60a109e3d89438 Mon Sep 17 1From c3c20db4415e0f6c4a601d6f9da1f3746a96b301 Mon Sep 17 00:00:00 2001
2 00:00:00 2001 From: Koen Kooi <koen@dominion.thruhere.net> Date: Wed, 2 Nov 2From: Claude Bing <cbing@cybernetics.com>
3 2011 16:54:57 +0100 Subject: [PATCH] Upstream-Status: Pending 3Date: Tue, 9 Nov 2021 13:08:58 -0500
4Subject: [PATCH 08/11] ext/imap/config.m4: fix include paths
4 5
5update patch to version 7.4.4 6Upstream-Status: Pending
6Signed-off-by: Changqing Li <changqing.li@windriver.com> 7Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
8
9update patch to version 8.0.12
10Signed-off-by: Claude Bing <cbing@cybernetics.com>
7--- 11---
8 ext/imap/config.m4 | 10 ++-------- 12 ext/imap/config.m4 | 10 ++--------
9 1 file changed, 2 insertions(+), 8 deletions(-) 13 1 file changed, 2 insertions(+), 8 deletions(-)
10 14
11diff --git a/ext/imap/config.m4 b/ext/imap/config.m4 15diff --git a/ext/imap/config.m4 b/ext/imap/config.m4
12index 5086a31..0e938bd 100644 16index 5086a312d0..0e938bd544 100644
13--- a/ext/imap/config.m4 17--- a/ext/imap/config.m4
14+++ b/ext/imap/config.m4 18+++ b/ext/imap/config.m4
15@@ -110,7 +110,7 @@ if test "$PHP_IMAP" != "no"; then 19@@ -110,7 +110,7 @@ if test "$PHP_IMAP" != "no"; then
@@ -37,5 +41,5 @@ index 5086a31..0e938bd 100644
37 IMAP_LIB_CHK($PHP_LIBDIR) 41 IMAP_LIB_CHK($PHP_LIBDIR)
38 IMAP_LIB_CHK(c-client) 42 IMAP_LIB_CHK(c-client)
39-- 43--
402.7.4 442.25.1
41 45
diff --git a/meta-oe/recipes-devtools/php/php/0001-php-don-t-use-broken-wrapper-for-mkdir.patch b/meta-oe/recipes-devtools/php/php/0009-php-don-t-use-broken-wrapper-for-mkdir.patch
index d68737366e..57b05e6a77 100644
--- a/meta-oe/recipes-devtools/php/php/0001-php-don-t-use-broken-wrapper-for-mkdir.patch
+++ b/meta-oe/recipes-devtools/php/php/0009-php-don-t-use-broken-wrapper-for-mkdir.patch
@@ -1,21 +1,21 @@
1From ebc101e0728b9db6c687cff525e5dfc8eb0edbf3 Mon Sep 17 00:00:00 2001 1From 8707720c0aea405f0e06d67354f239232cc823cc Mon Sep 17 00:00:00 2001
2From: Koen Kooi <koen@dominion.thruhere.net> 2From: Claude Bing <cbing@cybernetics.com>
3Date: Thu, 3 Nov 2011 14:27:15 +0100 3Date: Tue, 9 Nov 2021 13:10:02 -0500
4Subject: [PATCH 2/8] php: don't use broken wrapper for mkdir 4Subject: [PATCH 09/11] php: don't use broken wrapper for mkdir
5 5
6Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> 6Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
7 7
8update patch to version 7.4.4 8update patch to version 7.4.4
9Signed-off-by: Changqing Li <changqing.li@windriver.com> 9Signed-off-by: Changqing Li <changqing.li@windriver.com>
10---
11
12Upstream-Status: Inappropriate
13 10
11update patch to version 8.0.12
12Signed-off-by: Claude Bing <cbing@cybernetics.com>
13---
14 build/Makefile.global | 2 +- 14 build/Makefile.global | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-) 15 1 file changed, 1 insertion(+), 1 deletion(-)
16 16
17diff --git a/build/Makefile.global b/build/Makefile.global 17diff --git a/build/Makefile.global b/build/Makefile.global
18index ff858c2..ae554b4 100644 18index 6566d052de..eb39421f2a 100644
19--- a/build/Makefile.global 19--- a/build/Makefile.global
20+++ b/build/Makefile.global 20+++ b/build/Makefile.global
21@@ -1,4 +1,4 @@ 21@@ -1,4 +1,4 @@
@@ -25,5 +25,5 @@ index ff858c2..ae554b4 100644
25 INSTALL_DATA = $(INSTALL) -m 644 25 INSTALL_DATA = $(INSTALL) -m 644
26 26
27-- 27--
281.9.3 282.25.1
29 29
diff --git a/meta-oe/recipes-devtools/php/php/0010-iconv-fix-detection.patch b/meta-oe/recipes-devtools/php/php/0010-iconv-fix-detection.patch
new file mode 100644
index 0000000000..e3b8cd4707
--- /dev/null
+++ b/meta-oe/recipes-devtools/php/php/0010-iconv-fix-detection.patch
@@ -0,0 +1,35 @@
1From a04aabc5b80371e579fbaffdd417627390d22722 Mon Sep 17 00:00:00 2001
2From: Claude Bing <cbing@cybernetics.com>
3Date: Tue, 9 Nov 2021 13:10:33 -0500
4Subject: [PATCH 10/11] iconv: fix detection
5
6Upstream-Status: Pending
7
8Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
9
10update patch to version 7.4.4
11Signed-off-by: Changqing Li <changqing.li@windriver.com>
12
13update patch to version 8.0.12
14Signed-off-by: Claude Bing <cbing@cybernetics.com>
15---
16 build/php.m4 | 3 ++-
17 1 file changed, 2 insertions(+), 1 deletion(-)
18
19diff --git a/build/php.m4 b/build/php.m4
20index 93551d9ca7..dba50825fb 100644
21--- a/build/php.m4
22+++ b/build/php.m4
23@@ -1919,7 +1919,8 @@ AC_DEFUN([PHP_SETUP_ICONV], [
24 unset ICONV_DIR
25
26 dnl Check libc first if no path is provided in --with-iconv.
27- if test "$PHP_ICONV" = "yes"; then
28+ dnl must check against no, not against yes as PHP_ICONV can also include a path, which implies yes
29+ if test "$PHP_ICONV" != "no"; then
30 dnl Reset LIBS temporarily as it may have already been included -liconv in.
31 LIBS_save="$LIBS"
32 LIBS=
33--
342.25.1
35
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
new file mode 100644
index 0000000000..2ba0f2b771
--- /dev/null
+++ b/meta-oe/recipes-devtools/php/php/0011-opcache-jit-use-minilua-in-sysroot.patch
@@ -0,0 +1,29 @@
1From aaa6a81cfb20f9b3c25aa22e5a472c0f2867f72c Mon Sep 17 00:00:00 2001
2From: Claude Bing <cbing@cybernetics.com>
3Date: Tue, 9 Nov 2021 13:11:42 -0500
4Subject: [PATCH 11/11] opcache/jit: use minilua in sysroot
5
6Signed-off-by: Claude Bing <cbing@cybernetics.com>
7---
8 ext/opcache/jit/Makefile.frag | 7 ++-----
9 1 file changed, 2 insertions(+), 5 deletions(-)
10
11diff --git a/ext/opcache/jit/Makefile.frag b/ext/opcache/jit/Makefile.frag
12index b3af5b290a..f2e737e463 100644
13--- a/ext/opcache/jit/Makefile.frag
14+++ b/ext/opcache/jit/Makefile.frag
15@@ -1,9 +1,6 @@
16
17-$(builddir)/minilua: $(srcdir)/jit/dynasm/minilua.c
18- $(CC) $(srcdir)/jit/dynasm/minilua.c -lm -o $@
19-
20-$(builddir)/jit/zend_jit_x86.c: $(srcdir)/jit/zend_jit_x86.dasc $(srcdir)/jit/dynasm/*.lua $(builddir)/minilua
21- $(builddir)/minilua $(srcdir)/jit/dynasm/dynasm.lua $(DASM_FLAGS) -o $@ $(srcdir)/jit/zend_jit_x86.dasc
22+$(builddir)/jit/zend_jit_x86.c: $(srcdir)/jit/zend_jit_x86.dasc $(srcdir)/jit/dynasm/*.lua
23+ @minilua $(srcdir)/jit/dynasm/dynasm.lua $(DASM_FLAGS) -o $@ $(srcdir)/jit/zend_jit_x86.dasc
24
25 $(builddir)/jit/zend_jit.lo: \
26 $(builddir)/jit/zend_jit_x86.c \
27--
282.25.1
29
diff --git a/meta-oe/recipes-devtools/php/php/70_mod_php7.conf b/meta-oe/recipes-devtools/php/php/70_mod_php8.conf
index d206265a25..5a9dc91c6c 100644
--- a/meta-oe/recipes-devtools/php/php/70_mod_php7.conf
+++ b/meta-oe/recipes-devtools/php/php/70_mod_php8.conf
@@ -1,6 +1,6 @@
1LoadModule php7_module lib/apache2/modules/libphp7.so 1LoadModule php7_module lib/apache2/modules/libphp7.so
2 2
3<FilesMatch "\.ph(p[2-7]?|tml)$"> 3<FilesMatch "\.ph(p[2-8]?|tml)$">
4 SetHandler application/x-httpd-php 4 SetHandler application/x-httpd-php
5</FilesMatch> 5</FilesMatch>
6 6
diff --git a/meta-oe/recipes-devtools/php/php/iconv.patch b/meta-oe/recipes-devtools/php/php/iconv.patch
deleted file mode 100644
index 9ec8a89b57..0000000000
--- a/meta-oe/recipes-devtools/php/php/iconv.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1Subject: [PATCH] From 17cc5645f3acf943a5a06465d09d0ebcfea987bd Mon Sep 17
2 00:00:00 2001 From: Koen Kooi <koen@dominion.thruhere.net> Date: Wed, 2 Nov
3 2011 16:54:57 +0100 Subject: [PATCH] Upstream-Status: Pending
4
5update patch to version 7.4.4
6Signed-off-by: Changqing Li <changqing.li@windriver.com>
7---
8 build/php.m4 | 3 ++-
9 ext/iconv/config.m4 | 2 +-
10 2 files changed, 3 insertions(+), 2 deletions(-)
11
12diff --git a/build/php.m4 b/build/php.m4
13index 7392876..5c45d13 100644
14--- a/build/php.m4
15+++ b/build/php.m4
16@@ -1950,7 +1950,8 @@ AC_DEFUN([PHP_SETUP_ICONV], [
17 echo > ext/iconv/php_iconv_supports_errno.h
18
19 dnl Check libc first if no path is provided in --with-iconv.
20- if test "$PHP_ICONV" = "yes"; then
21+ dnl must check against no, not against yes as PHP_ICONV can also include a path, which implies yes
22+ if test "$PHP_ICONV" != "no"; then
23 dnl Reset LIBS temporarily as it may have already been included -liconv in.
24 LIBS_save="$LIBS"
25 LIBS=
26diff --git a/ext/iconv/config.m4 b/ext/iconv/config.m4
27index fe9b47a..b6b632f 100644
28--- a/ext/iconv/config.m4
29+++ b/ext/iconv/config.m4
30@@ -14,7 +14,7 @@ if test "$PHP_ICONV" != "no"; then
31
32 if test "$iconv_avail" != "no"; then
33 if test -z "$ICONV_DIR"; then
34- for i in /usr/local /usr; do
35+ for i in $PHP_ICONV /usr/local /usr; do
36 if test -f "$i/include/iconv.h" || test -f "$i/include/giconv.h"; then
37 PHP_ICONV_PREFIX="$i"
38 break
39--
402.7.4
41
diff --git a/meta-oe/recipes-devtools/php/php/xfail_two_bug_tests.patch b/meta-oe/recipes-devtools/php/php/xfail_two_bug_tests.patch
deleted file mode 100644
index 21057439c9..0000000000
--- a/meta-oe/recipes-devtools/php/php/xfail_two_bug_tests.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1php-ptest: xfail two tests
2
3If and when these tests are modified to expect the correct output, they will
4succeed and generate warnings in the test summary. This patch can then be removed.
5
6Note that we add a closing '?>' to one test so that it can be executed directly by php.
7
8Upstream-Status: Pending
9
10Signed-off-By: Joe Slater <joe.slater@windriver.com>
11
12
13--- a/tests/basic/bug71273.phpt
14+++ b/tests/basic/bug71273.phpt
15@@ -16,6 +16,8 @@ Bug #71273 A wrong ext directory setup i
16 var_dump(preg_match(",.+a[\\/].+[\\/]w.php_kartoffelbrei.dll.+,s", $out));
17 ?>
18 ==DONE==
19+--XFAIL--
20+Output is int(0), not int(1)
21 --EXPECT--
22 int(1)
23 ==DONE==
24--- a/tests/run-test/bug75042-3.phpt
25+++ b/tests/run-test/bug75042-3.phpt
26@@ -8,5 +8,8 @@ display_errors=1
27 nonexistentsharedmodule
28 --FILE--
29 <?php
30+?>
31+--XFAIL--
32+No warning message printed.
33 --EXPECTF--
34 PHP Warning: PHP Startup: Unable to load dynamic library '%snonexistentsharedmodule.%s' %A
diff --git a/meta-oe/recipes-devtools/php/php_7.4.21.bb b/meta-oe/recipes-devtools/php/php_8.0.12.bb
index ab87ced885..300499de5c 100644
--- a/meta-oe/recipes-devtools/php/php_7.4.21.bb
+++ b/meta-oe/recipes-devtools/php/php_8.0.12.bb
@@ -12,28 +12,28 @@ DEPENDS:class-native = "zlib-native libxml2-native"
12PHP_MAJOR_VERSION = "${@d.getVar('PV').split('.')[0]}" 12PHP_MAJOR_VERSION = "${@d.getVar('PV').split('.')[0]}"
13 13
14SRC_URI = "http://php.net/distributions/php-${PV}.tar.bz2 \ 14SRC_URI = "http://php.net/distributions/php-${PV}.tar.bz2 \
15 file://0001-php-don-t-use-broken-wrapper-for-mkdir.patch \ 15 file://0002-build-php.m4-don-t-unset-cache-variables.patch \
16 file://debian-php-fixheader.patch \ 16 file://0003-php-remove-host-specific-info-from-header-file.patch \
17 file://0001-configure.ac-don-t-include-build-libtool.m4.patch \ 17 file://0004-configure.ac-don-t-include-build-libtool.m4.patch \
18 file://0001-php.m4-don-t-unset-cache-variables.patch \ 18 file://0009-php-don-t-use-broken-wrapper-for-mkdir.patch \
19 file://0010-iconv-fix-detection.patch \
19 " 20 "
20 21
21SRC_URI:append:class-target = " \ 22SRC_URI:append:class-target = " \
22 file://iconv.patch \ 23 file://0001-ext-opcache-config.m4-enable-opcache.patch \
23 file://imap-fix-autofoo.patch \ 24 file://0005-pear-fix-Makefile.frag-for-Yocto.patch \
24 file://php_exec_native.patch \ 25 file://0006-ext-phar-Makefile.frag-Fix-phar-packaging.patch \
26 file://0007-sapi-cli-config.m4-fix-build-directory.patch \
27 file://0008-ext-imap-config.m4-fix-include-paths.patch \
28 file://0011-opcache-jit-use-minilua-in-sysroot.patch \
25 file://php-fpm.conf \ 29 file://php-fpm.conf \
26 file://php-fpm-apache.conf \ 30 file://php-fpm-apache.conf \
27 file://70_mod_php${PHP_MAJOR_VERSION}.conf \ 31 file://70_mod_php${PHP_MAJOR_VERSION}.conf \
28 file://php-fpm.service \ 32 file://php-fpm.service \
29 file://pear-makefile.patch \
30 file://phar-makefile.patch \
31 file://0001-opcache-config.m4-enable-opcache.patch \
32 file://xfail_two_bug_tests.patch \
33 " 33 "
34 34
35S = "${WORKDIR}/php-${PV}" 35S = "${WORKDIR}/php-${PV}"
36SRC_URI[sha256sum] = "36ec6102e757e2c2b7742057a700bbff77c76fa0ccbe9c860398c3d24e32822a" 36SRC_URI[sha256sum] = "b4886db1df322dc8fb128d8b34ae7e94f6fc682ecb29ff4f5a591d4de9feadbf"
37 37
38 38
39inherit autotools pkgconfig python3native gettext 39inherit autotools pkgconfig python3native gettext
@@ -258,6 +258,10 @@ RCONFLICTS:${PN}-modphp = "${MODPHP_OLDPACKAGE}"
258do_install:append:class-native() { 258do_install:append:class-native() {
259 create_wrapper ${D}${bindir}/php \ 259 create_wrapper ${D}${bindir}/php \
260 PHP_PEAR_SYSCONF_DIR=${sysconfdir}/ 260 PHP_PEAR_SYSCONF_DIR=${sysconfdir}/
261
262 if [ "$MACHINE_ARCH" == "x86" || "$MACHINE_ARCH" == "x86-64" ]; then
263 install -m 0755 ${WORKDIR}/build/ext/opcache/minilua ${D}${bindir}/
264 fi
261} 265}
262 266
263 267
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-05-21 17:18:27 +0000