aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-devtools/php/php/change-AC_TRY_RUN-to-AC_TRY_LINK.patch
blob: 3e901841be9f81f9a68c86dd27486ca3fa4e3c50 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
From 3bfcc7fdd22261eaed10949714de0a90d31e10ab 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] [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
---
 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 523b4fd..0aaa4c8 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 libmagic/der.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