From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Sun, 18 Mar 2007 00:53:42 +0000 (+0000)
Subject: php: Unbreak php 5.2.0 build
X-Git-Tag: Release-2010-05/1~8868^2~1032^2~7^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=684193b3a8075edef80c3036aefa24b6cc9814f9;p=openembedded.git

php: Unbreak php 5.2.0 build
---

diff --git a/packages/php/php_5.2.0.bb b/packages/php/php_5.2.0.bb
index 919d96f8e3..3b24fbec40 100644
--- a/packages/php/php_5.2.0.bb
+++ b/packages/php/php_5.2.0.bb
@@ -3,9 +3,8 @@ DESCRIPTION = "A server-side, HTML-embedded scripting language. This package pro
 LICENSE = "PHP"
 DEPENDS = "zlib libxml2 mysql libiconv"
 SRC_URI = "http://us2.php.net/distributions/php-${PV}.tar.bz2\
-	       	file://autotools.patch;patch=1 \
-		file://acinclude-xml2-config.patch;patch=1 \
 	 "
+
 S = "${WORKDIR}/php-${PV}"
 PR = "r0"
 
@@ -15,6 +14,7 @@ export THREADS="pthread"
 export LIBS=" -lpthread "
 
 CFLAGS += " -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED"
+
 EXTRA_OECONF = "    --without-iconv \
  		    --enable-discard-path \
 		    --enable-sockets \
@@ -31,6 +31,12 @@ export LD_LIBRARY_PATH = "${STAGING_LIBDIR}"
 
 acpaths = ""
 
+do_configure () {
+	autoreconf
+ac_cv_php_xml2_config_path=${STAGING_BINDIR_CROSS}/xml2-config oe_runconf
+}
+
+
 do_configure_append() {
     find ${S} -type f | xargs sed -i 's:I/usr/include:I${STAGING_INCDIR}:g'
 }