summaryrefslogtreecommitdiffstats
path: root/package/php/0005-ext-fileinfo-config.m4-allow-cache-answer-for-strcas.patch
diff options
context:
space:
mode:
authorAdam Duskett <aduskett@gmail.com>2018-02-02 07:50:39 -0500
committerPeter Korsgaard <peter@korsgaard.com>2018-02-02 21:36:38 +0100
commit9a7eca9baaf9930ef0c975621a8b941bfa11efe3 (patch)
tree456e200c1d341b9dbf0a64bf2ba2ae400d251970 /package/php/0005-ext-fileinfo-config.m4-allow-cache-answer-for-strcas.patch
parent5c7fd2ad10e2a383e8b87f23bc115887fd9b9b6c (diff)
downloadbuildroot-9a7eca9baaf9930ef0c975621a8b941bfa11efe3.tar.gz
buildroot-9a7eca9baaf9930ef0c975621a8b941bfa11efe3.zip
php: bump version to 7.2.2
Additional changes: - Fix ordering of patches. - Update patches to apply cleanly against 7.2.2 - Updates License sha256sum Signed-off-by: Adam Duskett <aduskett@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/php/0005-ext-fileinfo-config.m4-allow-cache-answer-for-strcas.patch')
-rw-r--r--package/php/0005-ext-fileinfo-config.m4-allow-cache-answer-for-strcas.patch6
1 files changed, 4 insertions, 2 deletions
diff --git a/package/php/0005-ext-fileinfo-config.m4-allow-cache-answer-for-strcas.patch b/package/php/0005-ext-fileinfo-config.m4-allow-cache-answer-for-strcas.patch
index a36c2a3ae0..257ac70f4f 100644
--- a/package/php/0005-ext-fileinfo-config.m4-allow-cache-answer-for-strcas.patch
+++ b/package/php/0005-ext-fileinfo-config.m4-allow-cache-answer-for-strcas.patch
@@ -5,6 +5,8 @@ Subject: [PATCH] ext/fileinfo/config.m4: allow cache answer for strcasestr
discovery
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+[aduskett@gmail.com: Update for 7.2.2]
+Signed-off-by: Adam Duskett <aduskett@gmail.com>
---
ext/fileinfo/config.m4 | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
@@ -13,14 +15,14 @@ diff --git a/ext/fileinfo/config.m4 b/ext/fileinfo/config.m4
index 7e98d62..8561962 100644
--- a/ext/fileinfo/config.m4
+++ b/ext/fileinfo/config.m4
-@@ -14,6 +14,7 @@ if test "$PHP_FILEINFO" != "no"; then
- libmagic/readcdf.c libmagic/softmagic.c"
+@@ -15,6 +15,7 @@ libmagic/readcdf.c libmagic/softmagic.c libmagic/der.c"
AC_MSG_CHECKING([for strcasestr])
+ AC_CACHE_VAL(ac_cv_func_strcasestr,
AC_TRY_RUN([
#include <string.h>
#include <strings.h>
+ #include <stdlib.h>
@@ -46,7 +47,7 @@ int main(void)
AC_MSG_RESULT(no)
AC_MSG_NOTICE(using libmagic strcasestr implementation)
OpenPOWER on IntegriCloud