summaryrefslogtreecommitdiffstats
path: root/meta-oe
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe')
-rw-r--r--meta-oe/recipes-devtools/php/php-7.1.9/change-AC_TRY_RUN-to-AC_TRY_LINK.patch56
-rw-r--r--meta-oe/recipes-devtools/php/php/0001-Add-lpthread-to-link.patch (renamed from meta-oe/recipes-devtools/php/php-5.6.33/0001-Add-lpthread-to-link.patch)0
-rw-r--r--meta-oe/recipes-devtools/php/php/0001-Specify-tag-with-libtool.patch (renamed from meta-oe/recipes-devtools/php/php-7.1.9/0001-Specify-tag-with-libtool.patch)0
-rw-r--r--meta-oe/recipes-devtools/php/php/CVE-2017-16642.patch (renamed from meta-oe/recipes-devtools/php/php-7.1.9/CVE-2017-16642.patch)0
-rw-r--r--meta-oe/recipes-devtools/php/php/CVE-2018-5711.patch (renamed from meta-oe/recipes-devtools/php/php-7.1.9/CVE-2018-5711.patch)0
-rw-r--r--meta-oe/recipes-devtools/php/php/change-AC_TRY_RUN-to-AC_TRY_LINK.patch (renamed from meta-oe/recipes-devtools/php/php-5.6.33/change-AC_TRY_RUN-to-AC_TRY_LINK.patch)0
6 files changed, 0 insertions, 56 deletions
diff --git a/meta-oe/recipes-devtools/php/php-7.1.9/change-AC_TRY_RUN-to-AC_TRY_LINK.patch b/meta-oe/recipes-devtools/php/php-7.1.9/change-AC_TRY_RUN-to-AC_TRY_LINK.patch
deleted file mode 100644
index 39c334f39..000000000
--- a/meta-oe/recipes-devtools/php/php-7.1.9/change-AC_TRY_RUN-to-AC_TRY_LINK.patch
+++ /dev/null
@@ -1,56 +0,0 @@
1[PATCH] config.m4: change AC_TRY_RUN to AC_TRY_LINK
2
3Upstream-Status: Pending
4
5AC_TRY_RUN is not suitable for cross-compile
6
7Signed-off-by: Roy Li <rongqing.li@windriver.com>
8---
9 ext/fileinfo/config.m4 | 31 ++++++-------------------------
10 1 file changed, 6 insertions(+), 25 deletions(-)
11
12diff --git a/ext/fileinfo/config.m4 b/ext/fileinfo/config.m4
13index 7e98d62..8a8ea0e 100644
14--- a/ext/fileinfo/config.m4
15+++ b/ext/fileinfo/config.m4
16@@ -14,31 +14,12 @@ if test "$PHP_FILEINFO" != "no"; then
17 libmagic/readcdf.c libmagic/softmagic.c"
18
19 AC_MSG_CHECKING([for strcasestr])
20- AC_TRY_RUN([
21-#include <string.h>
22-#include <strings.h>
23-#include <stdlib.h>
24-
25-int main(void)
26-{
27- char *s0, *s1, *ret;
28-
29- s0 = (char *) malloc(42);
30- s1 = (char *) malloc(8);
31-
32- memset(s0, 'X', 42);
33- s0[24] = 'Y';
34- s0[26] = 'Z';
35- s0[41] = '\0';
36- memset(s1, 'x', 8);
37- s1[0] = 'y';
38- s1[2] = 'Z';
39- s1[7] = '\0';
40-
41- ret = strcasestr(s0, s1);
42-
43- return !(NULL != ret);
44-}
45+ AC_TRY_COMPILE([
46+ #include <string.h>
47+ #include <strings.h>
48+ #include <stdlib.h>
49+ ],[
50+ strcasestr(NULL, NULL);
51 ],[
52 dnl using the platform implementation
53 AC_MSG_RESULT(yes)
54--
551.9.1
56
diff --git a/meta-oe/recipes-devtools/php/php-5.6.33/0001-Add-lpthread-to-link.patch b/meta-oe/recipes-devtools/php/php/0001-Add-lpthread-to-link.patch
index f70e550ff..f70e550ff 100644
--- a/meta-oe/recipes-devtools/php/php-5.6.33/0001-Add-lpthread-to-link.patch
+++ b/meta-oe/recipes-devtools/php/php/0001-Add-lpthread-to-link.patch
diff --git a/meta-oe/recipes-devtools/php/php-7.1.9/0001-Specify-tag-with-libtool.patch b/meta-oe/recipes-devtools/php/php/0001-Specify-tag-with-libtool.patch
index 18b4937db..18b4937db 100644
--- a/meta-oe/recipes-devtools/php/php-7.1.9/0001-Specify-tag-with-libtool.patch
+++ b/meta-oe/recipes-devtools/php/php/0001-Specify-tag-with-libtool.patch
diff --git a/meta-oe/recipes-devtools/php/php-7.1.9/CVE-2017-16642.patch b/meta-oe/recipes-devtools/php/php/CVE-2017-16642.patch
index 41d2a0f61..41d2a0f61 100644
--- a/meta-oe/recipes-devtools/php/php-7.1.9/CVE-2017-16642.patch
+++ b/meta-oe/recipes-devtools/php/php/CVE-2017-16642.patch
diff --git a/meta-oe/recipes-devtools/php/php-7.1.9/CVE-2018-5711.patch b/meta-oe/recipes-devtools/php/php/CVE-2018-5711.patch
index 596244d6b..596244d6b 100644
--- a/meta-oe/recipes-devtools/php/php-7.1.9/CVE-2018-5711.patch
+++ b/meta-oe/recipes-devtools/php/php/CVE-2018-5711.patch
diff --git a/meta-oe/recipes-devtools/php/php-5.6.33/change-AC_TRY_RUN-to-AC_TRY_LINK.patch b/meta-oe/recipes-devtools/php/php/change-AC_TRY_RUN-to-AC_TRY_LINK.patch
index 39c334f39..39c334f39 100644
--- a/meta-oe/recipes-devtools/php/php-5.6.33/change-AC_TRY_RUN-to-AC_TRY_LINK.patch
+++ b/meta-oe/recipes-devtools/php/php/change-AC_TRY_RUN-to-AC_TRY_LINK.patch