summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2004-04-01 08:19:20 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2004-04-01 08:19:20 +0000
commit4e6465f1fee8eccc133990e6201d499c07d7ae54 (patch)
tree1c54005fdd44b8ae2a8cab396ff08f135751225e /eclass
parentinherit flag-o-matic. (diff)
downloadhistorical-4e6465f1fee8eccc133990e6201d499c07d7ae54.tar.gz
historical-4e6465f1fee8eccc133990e6201d499c07d7ae54.tar.bz2
historical-4e6465f1fee8eccc133990e6201d499c07d7ae54.zip
add in fix for pear.conf issue, bug #36455.
Diffstat (limited to 'eclass')
-rw-r--r--eclass/php-sapi.eclass15
1 files changed, 14 insertions, 1 deletions
diff --git a/eclass/php-sapi.eclass b/eclass/php-sapi.eclass
index 883ce1591794..cf0ae8e3843e 100644
--- a/eclass/php-sapi.eclass
+++ b/eclass/php-sapi.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php-sapi.eclass,v 1.17 2004/04/01 06:18:43 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-sapi.eclass,v 1.18 2004/04/01 08:19:20 robbat2 Exp $
# Author: Robin H. Johnson <robbat2@gentoo.org>
inherit eutils flag-o-matic
@@ -550,6 +550,19 @@ php-sapi_src_install() {
fi
cp $x ${D}/usr/include/php/$x
done
+
+ if php-sapi_is_providerbuild; then
+ einfo "Fixing PEAR cache location"
+ local oldloc="${T}/pear/cache"
+ local old="s:${#oldloc}:\"${oldloc}\""
+ local newloc="/tmp/pear/cache"
+ local new="s:${#newloc}:\"${newloc}\""
+ sed "s|${old}|${new}|" -i ${D}/etc/pear.conf
+ keepdir /tmp/pear/cache
+ else
+ einfo "Removing duplicate PEAR conf file"
+ rm -f ${D}/etc/pear.conf 2>/dev/null
+ fi
}
php-sapi_pkg_preinst() {