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

diff --git a/packages/php/php-5.1.4/acinclude-xml2-config.patch b/packages/php/php-5.1.4/acinclude-xml2-config.patch
new file mode 100644 (file)
index 0000000..84d180e
--- /dev/null
+++ b/packages/php/php-5.1.4/acinclude-xml2-config.patch
@@ -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

diff --git a/packages/php/php_5.1.4.bb b/packages/php/php_5.1.4.bb
index 025f112..34d6ea6 100644 (file)
--- a/packages/php/php_5.1.4.bb
+++ b/packages/php/php_5.1.4.bb
@@ -2,10 +2,13 @@ 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 @@ export LIBS=" -lpthread "
 
 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"