diff options
| author |   Koen Kooi <koen@dominion.thruhere.net> | 2011-11-02 16:54:57 +0100 |
|---|---|---|
| committer | Koen Kooi <koen@dominion.thruhere.net> | 2011-11-03 15:02:20 +0100 |
| commit | 120753e7437bc893462356ef153b67d38f7f696e (patch) | |
| tree | e4e337cca6a8d989f038bb0533efd446afe272d6 /meta-oe/recipes-devtools/php/php/iconv.patch | |
| parent | b2bed436b4f0e14c1df71a7edfd10b94099e93b7 (diff) | |
| download | meta-openembedded-120753e7437bc893462356ef153b67d38f7f696e.tar.gz | |
php 5.3.6: import from OE classic
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe/recipes-devtools/php/php/iconv.patch')
| -rw-r--r-- | meta-oe/recipes-devtools/php/php/iconv.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/meta-oe/recipes-devtools/php/php/iconv.patch b/meta-oe/recipes-devtools/php/php/iconv.patch new file mode 100644 index 0000000000..66b39cc560 --- /dev/null +++ b/meta-oe/recipes-devtools/php/php/iconv.patch @@ -0,0 +1,27 @@ +Index: php-5.2.13/acinclude.m4 +=================================================================== +--- php-5.2.13.orig/acinclude.m4 ++++ php-5.2.13/acinclude.m4 +@@ -2430,7 +2430,8 @@ AC_DEFUN([PHP_SETUP_ICONV], [ + dnl + dnl Check libc first if no path is provided in --with-iconv + dnl +- 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 + AC_CHECK_FUNC(iconv, [ + found_iconv=yes + ],[ +Index: php-5.2.13/ext/iconv/config.m4 +=================================================================== +--- php-5.2.13.orig/ext/iconv/config.m4 ++++ php-5.2.13/ext/iconv/config.m4 +@@ -15,7 +15,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 |