diff options
| author | Michael Heimpold <mhei@heimpold.de> | 2019-02-10 21:45:16 +0100 |
|---|---|---|
| committer | Michael Heimpold <mhei@heimpold.de> | 2019-02-10 21:50:25 +0100 |
| commit | 1d4081dd4c43ab51d8a6393c0c6c57ba9a79b80c (patch) | |
| tree | 80d71728715de91536f383c32e2223930d18a728 /lang/php7/patches/1003-Fix-dl-cross-compiling-issue.patch | |
| parent | 4729c3fddf05d6c8496ac2602a843e7dce5990e4 (diff) | |
php7: fix cross compiling patch (fixes #8166)
Fixes: e148924a4 ("php7: update to 7.2.15")
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
Diffstat (limited to 'lang/php7/patches/1003-Fix-dl-cross-compiling-issue.patch')
| -rw-r--r-- | lang/php7/patches/1003-Fix-dl-cross-compiling-issue.patch | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/lang/php7/patches/1003-Fix-dl-cross-compiling-issue.patch b/lang/php7/patches/1003-Fix-dl-cross-compiling-issue.patch index 951b32573..075a98354 100644 --- a/lang/php7/patches/1003-Fix-dl-cross-compiling-issue.patch +++ b/lang/php7/patches/1003-Fix-dl-cross-compiling-issue.patch @@ -27,16 +27,14 @@ PHP_NEW_EXTENSION(fileinfo, fileinfo.c $libmagic_sources, $ext_shared,,-I@ext_srcdir@/libmagic) --- a/ext/opcache/config.m4 +++ b/ext/opcache/config.m4 -@@ -261,7 +261,11 @@ AC_TRY_RUN([ - ], [ - flock_type=linux - AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type]) --], []) -+], [ -+ dnl cross-compiling; assume Linux -+ flock_type=linux -+ AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type]) -+]) - fi +@@ -232,6 +232,10 @@ int main() { + flock_type=unknown + AC_MSG_CHECKING(for struct flock layout) ++dnl cross-compiling for Linux ++flock_type=linux ++AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type]) ++ if test "$flock_type" = "unknown"; then + AC_TRY_RUN([ + #include <fcntl.h> |