t-head/meta-openembedded
1
0
Fork 0
mirror of https://github.com/thead-yocto-mirror/meta-openembedded synced 2026-09-06 14:14:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

php: upgrade 7.3.16 -> 7.4.4

Browse Source 
License-Update: License updated (year updated)

note: for 7.4, pear is disabled by default,
and it will be deprecated in future.

Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Changqing Li
2020-04-24 08:57:11 +08:00
committed by Khem Raj
parent 30f1da6f26
commit 7cc7a9ec88
12 changed files with 132 additions and 498 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
meta-oe/recipes-devtools/php/php/iconv.patch
View File

@@ -1,32 +1,33 @@
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: Pending
Subject: [PATCH] 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: Pending
update patch to version 7.4.4
Signed-off-by: Changqing Li <changqing.li@windriver.com>
---
acinclude.m4 | 3 ++-
build/php.m4 | 3 ++-
ext/iconv/config.m4 | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/acinclude.m4 b/acinclude.m4
index d32766a..ad5166e 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2445,7 +2445,8 @@ AC_DEFUN([PHP_SETUP_ICONV], [
dnl Check libc first if no path is provided in --with-iconv
dnl
diff --git a/build/php.m4 b/build/php.m4
index 7392876..5c45d13 100644
--- a/build/php.m4
+++ b/build/php.m4
@@ -1950,7 +1950,8 @@ AC_DEFUN([PHP_SETUP_ICONV], [
echo > ext/iconv/php_iconv_supports_errno.h
dnl Check libc first if no path is provided in --with-iconv.
- if test "$PHP_ICONV" = "yes"; then
+ dnl must check against no, not against yes as PHP_ICONV can also include a path, which implies yes
+ if test "$PHP_ICONV" != "no"; then
dnl Reset LIBS temporarily as it may have already been included
dnl -liconv in.
dnl Reset LIBS temporarily as it may have already been included -liconv in.
LIBS_save="$LIBS"
LIBS=
diff --git a/ext/iconv/config.m4 b/ext/iconv/config.m4
index 6a05697..973e750 100644
index fe9b47a..b6b632f 100644
--- a/ext/iconv/config.m4
+++ b/ext/iconv/config.m4
@@ -15,7 +15,7 @@ if test "$PHP_ICONV" != "no"; then
@@ -14,7 +14,7 @@ if test "$PHP_ICONV" != "no"; then
if test "$iconv_avail" != "no"; then
if test -z "$ICONV_DIR"; then
@@ -35,3 +36,6 @@ index 6a05697..973e750 100644
if test -f "$i/include/iconv.h" || test -f "$i/include/giconv.h"; then
PHP_ICONV_PREFIX="$i"
break
--
2.7.4