mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-14 17:59:59 +00:00
Code Issues Projects Releases Wiki Activity

php7: upgrade to 7.1.7

Browse Source 
License checksum changed due to opyright year changed to 2017
Fix build with clang/hardening

ak] 7.1.x updates are bug or security fixes only. no new functions. Per PHP policy.
so update makes sence IMHO

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
(cherry picked from commit ad9df2b36a)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Khem Raj
2017-08-08 14:47:52 -07:00
committed by Armin Kuster
parent 2bf084929e
commit af09a2d721
4 changed files with 78 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-devtools/php/php-7.1.7/0001-Specify-tag-with-libtool.patch
+62
View File
@@ -0,0 +1,62 @@
From 5c84b039e97abd88f6a18da0e6d27383c00fea92 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 26 Jul 2017 23:06:56 -0700
Subject: [PATCH] Specify --tag with libtool
This helps in compiling with external toolchains
with -fPIE appended to CC e.g. via hardening flags
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
acinclude.m4 | 8 ++++----
configure.in | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/acinclude.m4 b/acinclude.m4
index a114a98..1cc7a26 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -806,10 +806,10 @@ dnl
dnl PHP_BUILD_PROGRAM
dnl
AC_DEFUN([PHP_BUILD_PROGRAM],[
- php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
+ php_c_pre='$(LIBTOOL) --tag=CC --mode=compile $(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
php_c_post=
- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
+ php_cxx_pre='$(LIBTOOL) --tag=CXX --mode=compile $(CXX)'
php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
php_cxx_post=
php_lo=lo
@@ -819,10 +819,10 @@ AC_DEFUN([PHP_BUILD_PROGRAM],[
no) pic_setting='-prefer-non-pic';;
esac
- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
+ shared_c_pre='$(LIBTOOL) --tag=CC --mode=compile $(CC)'
shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
shared_c_post=
- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
+ shared_cxx_pre='$(LIBTOOL) --tag=CXX --mode=compile $(CXX)'
shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting
shared_cxx_post=
shared_lo=lo
diff --git a/configure.in b/configure.in
index 7d65b63..7221af9 100644
--- a/configure.in
+++ b/configure.in
@@ -1431,8 +1431,8 @@ PHP_SET_LIBTOOL_VARIABLE([--silent])
dnl libtool 1.4.3 needs this.
PHP_SET_LIBTOOL_VARIABLE([--preserve-dup-deps])
-test -z "$PHP_COMPILE" && PHP_COMPILE='$(LIBTOOL) --mode=compile $(COMPILE) -c $<'
-test -z "$CXX_PHP_COMPILE" && CXX_PHP_COMPILE='$(LIBTOOL) --mode=compile $(CXX_COMPILE) -c $<'
+test -z "$PHP_COMPILE" && PHP_COMPILE='$(LIBTOOL) --tag=CC --mode=compile $(COMPILE) -c $<'
+test -z "$CXX_PHP_COMPILE" && CXX_PHP_COMPILE='$(LIBTOOL) --tag=CXX --mode=compile $(CXX_COMPILE) -c $<'
SHARED_LIBTOOL='$(LIBTOOL)'
CC=$old_CC
--
2.13.3
meta-oe/recipes-devtools/php/php-7.1.7/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