mirror of
https://github.com/thead-yocto-mirror/meta-openembedded
synced 2026-08-23 09:18:23 +02:00
1816eb7779
For changes, see: http://php.net/ChangeLog-5.php#5.6.35 Split patches between php5 and php7 to ensure there are no fuzz warnings for both the versions. Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
64 lines
1.5 KiB
Diff
64 lines
1.5 KiB
Diff
From 5f49987e88dfcbdb84be6e0c9025432fbd998709 Mon Sep 17 00:00:00 2001
|
|
From: Roy Li <rongqing.li@windriver.com>
|
|
Date: Thu, 20 Aug 2015 16:29:35 +0800
|
|
Subject: [PATCH] config.m4: change AC_TRY_RUN to AC_TRY_LINK
|
|
|
|
Upstream-Status: Pending
|
|
|
|
AC_TRY_RUN is not suitable for cross-compile
|
|
|
|
Signed-off-by: Roy Li <rongqing.li@windriver.com>
|
|
|
|
%% original patch: change-AC_TRY_RUN-to-AC_TRY_LINK.patch
|
|
|
|
%% original patch: php5-change-AC_TRY_RUN-to-AC_TRY_LINK.patch
|
|
---
|
|
ext/fileinfo/config.m4 | 31 ++++++-------------------------
|
|
1 file changed, 6 insertions(+), 25 deletions(-)
|
|
|
|
diff --git a/ext/fileinfo/config.m4 b/ext/fileinfo/config.m4
|
|
index 7e98d62..8a8ea0e 100644
|
|
--- a/ext/fileinfo/config.m4
|
|
+++ b/ext/fileinfo/config.m4
|
|
@@ -14,31 +14,12 @@ if test "$PHP_FILEINFO" != "no"; then
|
|
libmagic/readcdf.c libmagic/softmagic.c"
|
|
|
|
AC_MSG_CHECKING([for strcasestr])
|
|
- AC_TRY_RUN([
|
|
-#include <string.h>
|
|
-#include <strings.h>
|
|
-#include <stdlib.h>
|
|
-
|
|
-int main(void)
|
|
-{
|
|
- char *s0, *s1, *ret;
|
|
-
|
|
- s0 = (char *) malloc(42);
|
|
- s1 = (char *) malloc(8);
|
|
-
|
|
- memset(s0, 'X', 42);
|
|
- s0[24] = 'Y';
|
|
- s0[26] = 'Z';
|
|
- s0[41] = '\0';
|
|
- memset(s1, 'x', 8);
|
|
- s1[0] = 'y';
|
|
- s1[2] = 'Z';
|
|
- s1[7] = '\0';
|
|
-
|
|
- ret = strcasestr(s0, s1);
|
|
-
|
|
- return !(NULL != ret);
|
|
-}
|
|
+ AC_TRY_COMPILE([
|
|
+ #include <string.h>
|
|
+ #include <strings.h>
|
|
+ #include <stdlib.h>
|
|
+ ],[
|
|
+ strcasestr(NULL, NULL);
|
|
],[
|
|
dnl using the platform implementation
|
|
AC_MSG_RESULT(yes)
|
|
--
|
|
2.7.4
|
|
|