From 85656262f5d65aebc52916254d15785a9b3878c5 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Tue, 11 May 2010 12:38:15 +0000
Subject: main/php: enable shared xml

we need patch the make install to find the xml.so
---
 main/php/APKBUILD                   |  8 +++++++-
 main/php/php-install-pear-xml.patch | 15 +++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 main/php/php-install-pear-xml.patch

diff --git a/main/php/APKBUILD b/main/php/APKBUILD
index c2ab6e7906..43a33a6fd5 100644
--- a/main/php/APKBUILD
+++ b/main/php/APKBUILD
@@ -54,6 +54,7 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-cli $pkgname-pear
 	$pkgname-sysvmsg
 	$pkgname-sysvsem
 	$pkgname-sysvshm
+	$pkgname-xml
 	$pkgname-xmlrpc
 	$pkgname-xsl
 	$pkgname-zip
@@ -62,6 +63,7 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-cli $pkgname-pear
 
 source="http://www.php.net/distributions/${pkgname}-${pkgver}.tar.bz2
         http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz
+	php-install-pear-xml.patch
 	zend_execute_API.c.patch
 	"
 
@@ -70,6 +72,9 @@ _extdir="/usr/lib/php/20090626"
 build() {
         cd "$srcdir/$pkgname-$pkgver"
 
+	# beat the pear installer into using xml.so
+	patch -p1 -i "$srcdir"/php-install-pear-xml.patch || return 1
+
 	# apply suhosin patch
 	gunzip -c ${srcdir}/suhosin-patch-${_suhosinver}.patch.gz \
 		| patch -p1 || return 1
@@ -95,7 +100,7 @@ build() {
 		--enable-sysvmsg=shared \
 		--enable-sysvsem=shared \
 		--enable-sysvshm=shared \
-		--enable-xml \
+		--enable-xml=shared \
 		--enable-zip=shared \
 		--with-bz2=shared \
 		--with-curl=shared \
@@ -253,4 +258,5 @@ dev() {
 
 md5sums="46f500816125202c48a458d0133254a4  php-5.3.2.tar.bz2
 4647b05330862d6a1fc4469245cc6ade  suhosin-patch-5.3.2-0.9.9.1.patch.gz
+5111e3be06d391f8772587c675240fab  php-install-pear-xml.patch
 55f9d24316a57e0c0f6b4b84791a1a17  zend_execute_API.c.patch"
diff --git a/main/php/php-install-pear-xml.patch b/main/php/php-install-pear-xml.patch
new file mode 100644
index 0000000000..f7a6fff58b
--- /dev/null
+++ b/main/php/php-install-pear-xml.patch
@@ -0,0 +1,15 @@
+--- ./pear/Makefile.frag.orig
++++ ./pear/Makefile.frag
+@@ -2,8 +2,11 @@
+ 
+ peardir=$(PEAR_INSTALLDIR)
+ 
++# help the built php to find xml extension so we can install pear
++PEAR_INSTALL_XML_FLAGS = -d extension_dir="$(top_builddir)/modules" -d extension=xml.so
++
+ # Skip all php.ini files altogether
+-PEAR_INSTALL_FLAGS = -n -dshort_open_tag=0 -dsafe_mode=0 -dopen_basedir= -derror_reporting=1803 -dmemory_limit=-1 -ddetect_unicode=0
++PEAR_INSTALL_FLAGS = -n -dshort_open_tag=0 -dsafe_mode=0 -dopen_basedir= -derror_reporting=1803 -dmemory_limit=-1 -ddetect_unicode=0 $(PEAR_INSTALL_XML_FLAGS)
+ 
+ WGET = `which wget 2>/dev/null`
+ FETCH = `which fetch 2>/dev/null`
-- 
cgit v1.2.3