Commit 520126bd authored by Gustavo Zacarias's avatar Gustavo Zacarias Committed by Thomas Petazzoni
Browse files

php: allow cache for strcasestr test 

Fileinfo does an AC_TRY_RUN to test for strcasestr without allowing a
canned response, hence breaking cross-compiles. Use AC_CACHE_VAL. Fixes:
http://autobuild.buildroot.net/results/10a/10ae44cbc7c0c8e6f1ac54dae4c9d94c703aa3dd/



Signed-off-by: default avatarGustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 86071180

package/php/0005-ac-cache-strcasestr.patch

0 → 100644
+24 −0
Original line number Diff line number Diff line 
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)

package/php/php.mk

+3 −1
Original line number Diff line number Diff line
@@ -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