diff options
| author |   Claude Bing <cbing@cybernetics.com> | 2020-05-08 15:52:46 -0400 |
|---|---|---|
| committer |   Armin Kuster <akuster808@gmail.com> | 2020-05-17 14:38:21 -0700 |
| commit | a6c9ad397bfcf40c11d74d926b8fdd6c3dfb98eb (patch) | |
| tree | ed5d4a888d151321f9df14cae385aa37aab718f1 /meta-oe/recipes-devtools/php | |
| parent | 5c91e3aa46b7fa5427af584aefb51f22cf931917 (diff) | |
| download | meta-openembedded-a6c9ad397bfcf40c11d74d926b8fdd6c3dfb98eb.tar.gz | |
php: update fix for opcache link issue in 7.4.4
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>
(cherry picked from commit 3cfd16be4e1b62efe8ac640cecc080709cf2b9f9)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-oe/recipes-devtools/php')
| -rw-r--r-- | meta-oe/recipes-devtools/php/php/0001-opcache-config.m4-enable-opcache.patch | 19 | ||||
| -rw-r--r-- | meta-oe/recipes-devtools/php/php_7.4.4.bb | 5 |
2 files changed, 13 insertions, 11 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-opcache-config.m4-enable-opcache.patch index ee0d5edcdb..1f3e683a0f 100644 --- a/meta-oe/recipes-devtools/php/php/0001-opcache-config.m4-enable-opcache.patch +++ b/meta-oe/recipes-devtools/php/php/0001-opcache-config.m4-enable-opcache.patch @@ -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. Set @@ -12,15 +15,18 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> update patch to version 7.4.4 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 +------------------------------------------------- - 1 file changed, 3 insertions(+), 191 deletions(-) + ext/opcache/config.m4 | 195 +----------------------------------------- + 1 file changed, 4 insertions(+), 191 deletions(-) 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 +++ 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_MSG_CHECKING(for sysvipc shared memory support) @@ -222,9 +228,10 @@ index 6c40caf..84ddf1e 100644 - AC_MSG_RESULT([no]) - ]) + 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, ZendAccelerator.c \ -- -2.7.4 +2.17.1 diff --git a/meta-oe/recipes-devtools/php/php_7.4.4.bb b/meta-oe/recipes-devtools/php/php_7.4.4.bb index 07c3115060..1d93902e72 100644 --- a/meta-oe/recipes-devtools/php/php_7.4.4.bb +++ b/meta-oe/recipes-devtools/php/php_7.4.4.bb @@ -110,11 +110,6 @@ 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" -# 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 # default when cross compiling # See https://bugs.php.net/bug.php?id=60109 |