mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-15 16:07:26 +00:00
php7: upgrade to 7.2.4
* For changes, see: http://www.php.net/ChangeLog-7.php#7.2.4 * Remove patches as they've been upstreamed: - 0001-Specify-tag-with-libtool.patch - CVE-2017-16642.patch - CVE-2018-5711.patch * mcrypt module has been deprecated and as such dependency has been moved from php.inc to php5 recipe. * Refresh patches to avoid fuzz warnings. * New patches to: - Make sure libxml is detected using pkg-config instead of binconfig. - Fix link time warnings (backport, see patch for details) * Move the following patches to php5 from inc as they were getting applied out of context: - acinclude-xml2-config.patch - 0001-acinclude-use-pkgconfig-for-libxml2-config.patch License-Update: License is same, just a change in copyright year to 2018. Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
committed by
Armin Kuster
parent
08c5797ccb
commit
2768c1deb3
@@ -1,10 +1,18 @@
|
||||
Upstream-status: Unknown
|
||||
From 17cc5645f3acf943a5a06465d09d0ebcfea987bd Mon Sep 17 00:00:00 2001
|
||||
From: Koen Kooi <koen@dominion.thruhere.net>
|
||||
Date: Wed, 2 Nov 2011 16:54:57 +0100
|
||||
Subject: [PATCH] Upstream-status: Unknown
|
||||
|
||||
---
|
||||
acinclude.m4 | 3 ++-
|
||||
ext/iconv/config.m4 | 2 +-
|
||||
2 files changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/acinclude.m4 b/acinclude.m4
|
||||
index a6c0d84..df11abd 100644
|
||||
index d32766a..ad5166e 100644
|
||||
--- a/acinclude.m4
|
||||
+++ b/acinclude.m4
|
||||
@@ -2452,7 +2452,8 @@ AC_DEFUN([PHP_SETUP_ICONV], [
|
||||
@@ -2445,7 +2445,8 @@ AC_DEFUN([PHP_SETUP_ICONV], [
|
||||
dnl Check libc first if no path is provided in --with-iconv
|
||||
dnl
|
||||
|
||||
@@ -15,7 +23,7 @@ index a6c0d84..df11abd 100644
|
||||
dnl -liconv in.
|
||||
LIBS_save="$LIBS"
|
||||
diff --git a/ext/iconv/config.m4 b/ext/iconv/config.m4
|
||||
index d673b0a..1fbef13 100644
|
||||
index 6a05697..973e750 100644
|
||||
--- a/ext/iconv/config.m4
|
||||
+++ b/ext/iconv/config.m4
|
||||
@@ -15,7 +15,7 @@ if test "$PHP_ICONV" != "no"; then
|
||||
@@ -27,6 +35,3 @@ index d673b0a..1fbef13 100644
|
||||
if test -f "$i/include/iconv.h" || test -f "$i/include/giconv.h"; then
|
||||
PHP_ICONV_PREFIX="$i"
|
||||
break
|
||||
--
|
||||
1.9.3
|
||||
|
||||
|
||||
Reference in New Issue
Block a user