mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-15 06:10:02 +00:00
Code Issues Projects Releases Wiki Activity

php: upgrade to 5.3.19

Browse Source 
Signed-off-by: Eric Bénard <eric@eukrea.com>
Acked-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
This commit is contained in:
Eric BENARD
2012-11-27 16:16:41 +00:00
committed by Koen Kooi
parent 07e9ca6888
commit f8a7fc5574
3 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-devtools/php/php/iconv.patch
+13 -13
View File
@@ -1,21 +1,21 @@
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
diff --git a/acinclude.m4 b/acinclude.m4
index 4c28b80..d6491a1 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2439,7 +2439,8 @@ AC_DEFUN([PHP_SETUP_ICONV], [
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
dnl Reset LIBS temporarily as it may have already been included
dnl -liconv in.
LIBS_save="$LIBS"
diff --git a/ext/iconv/config.m4 b/ext/iconv/config.m4
index d673b0a..1fbef13 100644
--- a/ext/iconv/config.m4
+++ b/ext/iconv/config.m4
@@ -15,7 +15,7 @@ if test "$PHP_ICONV" != "no"; then
if test "$iconv_avail" != "no"; then