diff options
-rw-r--r-- | recipes/php/php-5.2.13/iconv.patch | 27 | ||||
-rw-r--r-- | recipes/php/php_5.2.13.bb | 5 |
2 files changed, 30 insertions, 2 deletions
diff --git a/recipes/php/php-5.2.13/iconv.patch b/recipes/php/php-5.2.13/iconv.patch new file mode 100644 index 0000000000..66b39cc560 --- /dev/null +++ b/recipes/php/php-5.2.13/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 diff --git a/recipes/php/php_5.2.13.bb b/recipes/php/php_5.2.13.bb index af9bd6acd3..dcc278b1b1 100644 --- a/recipes/php/php_5.2.13.bb +++ b/recipes/php/php_5.2.13.bb @@ -3,7 +3,7 @@ require php.inc DEPENDS = "zlib libxml2 virtual/libiconv php-native lemon-native mysql5 \ libc-client openssl" -PR = "${INC_PR}.3" +PR = "${INC_PR}.4" SRC_URI = "http://museum.php.net/php5/php-${PV}.tar.bz2;name=src \ file://acinclude-xml2-config.patch \ @@ -11,6 +11,7 @@ SRC_URI = "http://museum.php.net/php5/php-${PV}.tar.bz2;name=src \ file://pear-makefile.patch \ file://imap-fix-autofoo.patch \ file://CVE-2010-0397.patch \ + file://iconv.patch \ " SRC_URI[src.md5sum] = "eb4d0766dc4fb9667f05a68b6041e7d1" @@ -21,7 +22,6 @@ export LIBS=" -lpthread " EXTRA_OECONF = " --enable-mbstring \ --enable-discard-path \ - --disable-iconv \ --enable-sockets \ --enable-shared \ --enable-pcntl \ @@ -32,6 +32,7 @@ EXTRA_OECONF = " --enable-mbstring \ --with-imap=${STAGING_DIR_HOST} \ --with-imap-ssl=${STAGING_DIR_HOST} \ --with-zlib --with-zlib-dir=${STAGING_LIBDIR}/.. \ + --with-iconv=${STAGING_LIBDIR}/.. \ --with-libxml-dir=${STAGING_BINDIR_CROSS} \ --with-mysql="${STAGING_DIR_TARGET}${layout_exec_prefix}" \ --with-mysqli="${STAGING_BINDIR_CROSS}/mysql_config" \ |