[oe-commits] org.oe.dev packages/php/php-5.1.4.bb: Patch to allow php-5 to compile for x86 (at least)

[ifaistos commit]

packages/php/php-5.1.4.bb: Patch to allow php-5 to compile for x86 (at least)

Author: ifaistos at openembedded.org
Branch: org.openembedded.dev
Revision: ca58070f06e6821eaf8aa5f619c5bac64b324ac3
ViewMTN: http://monotone.openembedded.org/revision.psp?id=ca58070f06e6821eaf8aa5f619c5bac64b324ac3
Files:
1
packages/php/php-5.1.4/acinclude-xml2-config.patch
packages/php/php_5.1.4.bb
Diffs:

#
# mt diff -r00269cb6f4882dd70fd0b989f3df210ef3030959 -rca58070f06e6821eaf8aa5f619c5bac64b324ac3
#
# 
# 
# add_file "packages/php/php-5.1.4/acinclude-xml2-config.patch"
#  content [af113d1101713f3b7d218312f410ac42f240c565]
# 
# patch "packages/php/php_5.1.4.bb"
#  from [9f4094922da0a41688a8a86b2b559a7a2f62c77c]
#    to [faa45ca80e5ac5c9d8d718d4ccddc21f5f1510d8]
# 
============================================================
--- packages/php/php-5.1.4/acinclude-xml2-config.patch	af113d1101713f3b7d218312f410ac42f240c565
+++ packages/php/php-5.1.4/acinclude-xml2-config.patch	af113d1101713f3b7d218312f410ac42f240c565
@@ -0,0 +1,18 @@
+--- /orig-acinclude.m4	2007-02-20 15:03:25.000000000 +0200
++++ /acinclude.m4	2007-02-20 15:03:24.000000000 +0200
+@@ -2359,12 +2359,9 @@
+ AC_DEFUN([PHP_SETUP_LIBXML], [
+ AC_CACHE_CHECK([for xml2-config path], ac_cv_php_xml2_config_path,
+ [
+-  for i in $PHP_LIBXML_DIR /usr/local /usr; do
+-    if test -x "$i/bin/xml2-config"; then
+-      ac_cv_php_xml2_config_path="$i/bin/xml2-config"
+-      break
+-    fi
+-  done
++
++      ac_cv_php_xml2_config_path="$PHP_LIBXML_DIR/xml2-config"
++
+ ])
+ 
+   if test -x "$ac_cv_php_xml2_config_path"; then
============================================================
--- packages/php/php_5.1.4.bb	9f4094922da0a41688a8a86b2b559a7a2f62c77c
+++ packages/php/php_5.1.4.bb	faa45ca80e5ac5c9d8d718d4ccddc21f5f1510d8
@@ -1,11 +1,14 @@ DEPENDS = "zlib libxml2 mysql libiconv"
 SECTION = "console/network"
 DESCRIPTION = "A server-side, HTML-embedded scripting language. This package provides the CGI."
 LICENSE = "PHP"
 DEPENDS = "zlib libxml2 mysql libiconv"
-SRC_URI = "http://us2.php.net/distributions/php-${PV}.tar.bz2\
-	       file://autotools.patch;patch=1"
+
+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 = "r1"
+PR = "r2"
 
 inherit autotools
 
@@ -14,13 +17,13 @@ EXTRA_OECONF = "--without-iconv \
 
 CFLAGS += " -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED"
 EXTRA_OECONF = "--without-iconv \
- 			    --enable-discard-path \
-			    --enable-sockets \
-    		    --enable-memory-limit \
-    		    --enable-wddx \
-    		    --with-zlib"
+ 	        --enable-discard-path \
+	        --enable-sockets \
+    	        --enable-memory-limit \
+    	        --enable-wddx \
+    	         --with-zlib"
 
-EXTRA_OECONF += " --without-pear"
+EXTRA_OECONF += " --without-pear --with-libxml-dir=${STAGING_BINDIR} "
 # Uncomment the following two lines, and comment the above to enable PEAR
 #EXTRA_OECONF += " --with-pear-php-cli=${STAGING_BINDIR_NATIVE}/php"
 #DEPENDS += " php-native"