From: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Date: Sat, 16 Oct 2010 23:40:11 +0000 (+0200)
Subject: php: version 5.2.13 removed --without-iconv
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f6fa9298359781393ed2466c45cf42da56068bb1;p=openembedded.git

php: version 5.2.13 removed --without-iconv

5.2.13 had an inconsistency: there was a DEPENDS on virtual/iconv
yet there was a configure argument --without-iconv
as my project needed iconv, I removed the --without-iconv
(works like a charm :-) )

Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
---

diff --git a/recipes/php/php_5.2.13.bb b/recipes/php/php_5.2.13.bb
index ea07ba3341..0f9317d3f4 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 = "r6"
+PR = "r7"
 
 SRC_URI += "file://pear-makefile.patch \
             file://imap-fix-autofoo.patch \
@@ -15,8 +15,7 @@ SRC_URI[src.sha256sum] = "2b50a2535e3bb9a98cd4d1633f9452d877276c40b385915261f040
 export THREADS="pthread"
 export LIBS=" -lpthread "
 
-EXTRA_OECONF = "    --without-iconv \
-                    --enable-mbstring \
+EXTRA_OECONF = "    --enable-mbstring \
                     --enable-discard-path \
                     --enable-sockets \
                     --enable-shared \