diff options
| author | Michael Heimpold <mhei@heimpold.de> | 2016-07-19 23:12:00 +0200 |
|---|---|---|
| committer | Michael Heimpold <mhei@heimpold.de> | 2016-09-03 21:51:23 +0200 |
| commit | c6d45a041edd86be7aa645a045b70bcac31c55ed (patch) | |
| tree | fa63c5e168964e5954d4fed0d528fd3e7e32ec5b /lang/php7/patches/1003-Fix-dl-cross-compiling-issue.patch | |
| parent | 292c2ffc18bba09bc443cb75032a2daca6a30254 (diff) | |
php7: restructure patches
- Add some more patches from Debian
- Rename existing ones (our own patches starts with prefix 1000+)
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
Diffstat (limited to 'lang/php7/patches/1003-Fix-dl-cross-compiling-issue.patch')
1 files changed, 59 insertions, 0 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 new file mode 100644 index 000000000..22122ec82 --- /dev/null +++ b/lang/php7/patches/1003-Fix-dl-cross-compiling-issue.patch @@ -0,0 +1,59 @@ +--- a/configure.in ++++ b/configure.in +@@ -453,7 +453,10 @@ PHP_CHECK_FUNC(gethostname, nsl) + PHP_CHECK_FUNC(gethostbyaddr, nsl) + PHP_CHECK_FUNC(yp_get_default_domain, nsl) + +-PHP_CHECK_FUNC(dlopen, dl) ++PHP_ADD_LIBRARY(dl) ++PHP_DEF_HAVE(dlopen) ++PHP_DEF_HAVE(libdl) ++ac_cv_func_dlopen=yes + if test "$ac_cv_func_dlopen" = "yes"; then + AC_DEFINE(HAVE_LIBDL, 1, [ ]) + fi +--- a/ext/fileinfo/config.m4 ++++ b/ext/fileinfo/config.m4 +@@ -46,6 +46,10 @@ int main(void) + AC_MSG_RESULT(no) + AC_MSG_NOTICE(using libmagic strcasestr implementation) + libmagic_sources="$libmagic_sources libmagic/strcasestr.c" ++ ],[ ++ dnl cross-compiling; assume not present ++ AC_MSG_NOTICE(using libmagic strcasestr implementation) ++ libmagic_sources="$libmagic_sources libmagic/strcasestr.c" + ]) + + PHP_NEW_EXTENSION(fileinfo, fileinfo.c $libmagic_sources, $ext_shared,,-I@ext_srcdir@/libmagic) +--- a/ext/opcache/config.m4 ++++ b/ext/opcache/config.m4 +@@ -227,7 +227,14 @@ AC_TRY_RUN([ + flock_type=linux + AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type]) + AC_MSG_RESULT("yes") +-], AC_MSG_RESULT("no") ) ++], [ ++ AC_MSG_RESULT("no") ++], [ ++ dnl cross-compiling; assume Linux ++ flock_type=linux ++ AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type]) ++ AC_MSG_RESULT("yes") ++]) + + AC_MSG_CHECKING("whether flock struct is BSD ordered") + AC_TRY_RUN([ +@@ -243,7 +250,12 @@ AC_TRY_RUN([ + flock_type=bsd + AC_DEFINE([HAVE_FLOCK_BSD], [], [Struct flock is BSD-type]) + AC_MSG_RESULT("yes") +-], AC_MSG_RESULT("no") ) ++], [ ++ AC_MSG_RESULT("no") ++], [ ++ dnl cross-compiling; assume Linux ++ AC_MSG_RESULT("no") ++]) + + if test "$flock_type" == "unknown"; then + AC_MSG_ERROR([Don't know how to define struct flock on this system[,] set --enable-opcache=no]) |