mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-02 01:50:18 +00:00
Code Issues Projects Releases Wiki Activity

php: update fix for opcache link issue in 7.4.4

Browse Source 
The source of the issue is the update for PHP 7.4 support in
0001-opcache-config.m4-enable-opcache.patch (commit 7cc7a9ec).  Instead
of working around the issue in the recipe file, update the patch to
restore the call to PHP_ADD_LIBRARY().

Signed-off-by: Claude Bing <cbing@cybernetics.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Claude Bing
2020-05-08 15:52:46 -04:00
committed by Khem Raj
parent e421f6c71c
commit 3cfd16be4e
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-devtools/php/php/0001-opcache-config.m4-enable-opcache.patch
+13 -6
View File
@@ -1,4 +1,7 @@
opcache/config.m4: enable opcache From a74b42098aededd296ec6a3cd4cf5a17e59d6f29 Mon Sep 17 00:00:00 2001
From: Claude Bing <cbing@cybernetics.com>
Date: Fri, 8 May 2020 10:15:32 -0400
Subject: [PATCH] opcache/config.m4: enable opcache
We can't use AC_TRY_RUN to run programs in a cross compile environment. We can't use AC_TRY_RUN to run programs in a cross compile environment.
Set Set
@@ -12,15 +15,18 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
update patch to version 7.4.4 update patch to version 7.4.4
Signed-off-by: Changqing Li <changqing.li@windriver.com> Signed-off-by: Changqing Li <changqing.li@windriver.com>
fix issue linking with librt
Signed-off-by: Claude Bing <cbing@cybernetics.com>
--- ---
ext/opcache/config.m4 | 194 +------------------------------------------------- ext/opcache/config.m4 | 195 +-----------------------------------------
1 file changed, 3 insertions(+), 191 deletions(-) 1 file changed, 4 insertions(+), 191 deletions(-)
diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4 diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4
index 6c40caf..84ddf1e 100644 index 6c40cafc1c..6569aa9e1c 100644
--- a/ext/opcache/config.m4 --- a/ext/opcache/config.m4
+++ b/ext/opcache/config.m4 +++ b/ext/opcache/config.m4
@@ -23,201 +23,13 @@ if test "$PHP_OPCACHE" != "no"; then @@ -23,201 +23,14 @@ if test "$PHP_OPCACHE" != "no"; then
AC_CHECK_FUNCS([mprotect]) AC_CHECK_FUNCS([mprotect])
AC_MSG_CHECKING(for sysvipc shared memory support) AC_MSG_CHECKING(for sysvipc shared memory support)
@@ -222,9 +228,10 @@ index 6c40caf..84ddf1e 100644
- AC_MSG_RESULT([no]) - AC_MSG_RESULT([no])
- ]) - ])
+ AC_DEFINE(HAVE_SHM_MMAP_POSIX, 1, [Define if you have POSIX mmap() SHM support]) + AC_DEFINE(HAVE_SHM_MMAP_POSIX, 1, [Define if you have POSIX mmap() SHM support])
+ PHP_CHECK_LIBRARY(rt, shm_unlink, [PHP_ADD_LIBRARY(rt,1,OPCACHE_SHARED_LIBADD)])
PHP_NEW_EXTENSION(opcache, PHP_NEW_EXTENSION(opcache,
ZendAccelerator.c \ ZendAccelerator.c \
-- --
2.7.4 2.17.1
meta-oe/recipes-devtools/php/php_7.4.4.bb
-5
View File
@@ -111,11 +111,6 @@ export PHP_NATIVE_DIR = "${STAGING_BINDIR_NATIVE}"
export PHP_PEAR_PHP_BIN = "${STAGING_BINDIR_NATIVE}/php" export PHP_PEAR_PHP_BIN = "${STAGING_BINDIR_NATIVE}/php"
CFLAGS += " -D_GNU_SOURCE -g -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED -I${STAGING_INCDIR}/apache2" CFLAGS += " -D_GNU_SOURCE -g -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED -I${STAGING_INCDIR}/apache2"
# link against librt (libc) if opcache is specified in order to avoid the
# following error:
# Failed loading /usr/lib/php7/extensions/no-debug-non-zts-20190902/opcache.so: /usr/lib/php7/extensions/no-debug-non-zts-20190902/opcache.so: undefined symbol: shm_unlink
LDFLAGS += "${@ " -lrt " if bb.utils.contains('PACKAGECONFIG', 'opcache', 'true', 'false', d) else "" }"
# Adding these flags enables dynamic library support, which is disabled by # Adding these flags enables dynamic library support, which is disabled by
# default when cross compiling # default when cross compiling
# See https://bugs.php.net/bug.php?id=60109 # See https://bugs.php.net/bug.php?id=60109