diff options
Diffstat (limited to 'meta-oe/recipes-devtools/php/php/iconv.patch')
| -rw-r--r-- | meta-oe/recipes-devtools/php/php/iconv.patch | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/meta-oe/recipes-devtools/php/php/iconv.patch b/meta-oe/recipes-devtools/php/php/iconv.patch index 255fbb062c..b6e3ceb0b9 100644 --- a/meta-oe/recipes-devtools/php/php/iconv.patch +++ b/meta-oe/recipes-devtools/php/php/iconv.patch @@ -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 - |