diff options
Diffstat (limited to 'meta-oe/recipes-devtools/php/php/iconv.patch')
| -rw-r--r-- | meta-oe/recipes-devtools/php/php/iconv.patch | 26 |
1 files changed, 6 insertions, 20 deletions
diff --git a/meta-oe/recipes-devtools/php/php/iconv.patch b/meta-oe/recipes-devtools/php/php/iconv.patch index 9ec8a89b57..9b2d85951c 100644 --- a/meta-oe/recipes-devtools/php/php/iconv.patch +++ b/meta-oe/recipes-devtools/php/php/iconv.patch @@ -5,16 +5,15 @@ Subject: [PATCH] From 17cc5645f3acf943a5a06465d09d0ebcfea987bd Mon Sep 17 update patch to version 7.4.4 Signed-off-by: Changqing Li <changqing.li@windriver.com> --- - build/php.m4 | 3 ++- - ext/iconv/config.m4 | 2 +- - 2 files changed, 3 insertions(+), 2 deletions(-) + build/php.m4 | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build/php.m4 b/build/php.m4 -index 7392876..5c45d13 100644 +index 93551d9c..dba50825 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 +@@ -1919,7 +1919,8 @@ AC_DEFUN([PHP_SETUP_ICONV], [ + unset ICONV_DIR dnl Check libc first if no path is provided in --with-iconv. - if test "$PHP_ICONV" = "yes"; then @@ -23,19 +22,6 @@ index 7392876..5c45d13 100644 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 fe9b47a..b6b632f 100644 ---- a/ext/iconv/config.m4 -+++ b/ext/iconv/config.m4 -@@ -14,7 +14,7 @@ if test "$PHP_ICONV" != "no"; then - - if test "$iconv_avail" != "no"; then - if test -z "$ICONV_DIR"; then -- for i in /usr/local /usr; do -+ for i in $PHP_ICONV /usr/local /usr; do - if test -f "$i/include/iconv.h" || test -f "$i/include/giconv.h"; then - PHP_ICONV_PREFIX="$i" - break -- -2.7.4 +2.25.1 |