mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-07-16 04:17:25 +00:00
Code Issues Projects Releases Wiki Activity

php: update stable version to 5.6.31

Browse Source 
Signed-off-by: Derek Straka <derek@asterius.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Derek Straka
2017-09-20 11:11:32 -04:00
committed by Martin Jansa
parent 6896f588b6
commit 94888f1f77
4 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-devtools/php/php-5.6.31/0001-Add-lpthread-to-link.patch
+38
View File
@@ -0,0 +1,38 @@
From ed0a954983d50267c2fc0bc13aba929ea0cad971 Mon Sep 17 00:00:00 2001
From: Dengke Du <dengke.du@windriver.com>
Date: Tue, 2 May 2017 06:34:40 +0000
Subject: [PATCH] Add -lpthread to link
When building the php-5.6.26, the following errors occured:
ld: TSRM/.libs/TSRM.o: undefined reference to symbol
'pthread_sigmask@@GLIBC_2.2.5'
error adding symbols: DSO missing from command line
This is because no pthread to link, so we should add it.
Upstream-Status: Pending
Signed-off-by: Dengke Du <dengke.du@windriver.com>
---
configure.in | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/configure.in b/configure.in
index a467dff1..9afef652 100644
--- a/configure.in
+++ b/configure.in
@@ -1058,7 +1058,8 @@ case $php_sapi_module in
;;
esac
-EXTRA_LIBS="$EXTRA_LIBS $DLIBS $LIBS"
+PTHREAD_LIBS="-lpthread"
+EXTRA_LIBS="$EXTRA_LIBS $DLIBS $LIBS $PTHREAD_LIBS"
dnl this has to be here to prevent the openssl crypt() from
dnl overriding the system provided crypt().
--
2.11.0
meta-oe/recipes-devtools/php/php-5.6.31/change-AC_TRY_RUN-to-AC_TRY_LINK.patch
+56
View File
@@ -0,0 +1,56 @@
[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>
---
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)
--
1.9.1