diff options
| -rw-r--r-- | package/php/0005-ac-cache-strcasestr.patch | 24 | ||||
| -rw-r--r-- | package/php/php.mk | 4 |
2 files changed, 27 insertions, 1 deletions
diff --git a/package/php/0005-ac-cache-strcasestr.patch b/package/php/0005-ac-cache-strcasestr.patch new file mode 100644 index 0000000000..8a8c5d86ff --- /dev/null +++ b/package/php/0005-ac-cache-strcasestr.patch @@ -0,0 +1,24 @@ +Allow cache answer for strcasestr discovery. + +Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> + +diff -Nura php-5.6.7.orig/ext/fileinfo/config.m4 php-5.6.7/ext/fileinfo/config.m4 +--- php-5.6.7.orig/ext/fileinfo/config.m4 2015-04-08 22:19:45.798770792 -0300 ++++ php-5.6.7/ext/fileinfo/config.m4 2015-04-08 22:26:33.110654338 -0300 +@@ -14,6 +14,7 @@ + libmagic/readcdf.c libmagic/softmagic.c" + + AC_MSG_CHECKING([for strcasestr]) ++ AC_CACHE_VAL(ac_cv_func_strcasestr, + AC_TRY_RUN([ + #include <string.h> + #include <strings.h> +@@ -46,7 +47,7 @@ + AC_MSG_RESULT(no) + 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) + PHP_ADD_BUILD_DIR($ext_builddir/libmagic) diff --git a/package/php/php.mk b/package/php/php.mk index f3556327ab..1a5e084f8f 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -20,7 +20,9 @@ PHP_CONF_OPTS = \ --without-pear \ --with-config-file-path=/etc \ --disable-rpath -PHP_CONF_ENV = EXTRA_LIBS="$(PHP_EXTRA_LIBS)" +PHP_CONF_ENV = \ + ac_cv_func_strcasestr=yes \ + EXTRA_LIBS="$(PHP_EXTRA_LIBS)" # PHP can't be AUTORECONFed the standard way unfortunately PHP_DEPENDENCIES += host-autoconf host-automake host-libtool |
