diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2004-01-08 22:04:10 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2004-01-08 22:04:10 +0000 |
| commit | 0c7dc4f0427e77709e505607bb6d2f7d90b83708 (patch) | |
| tree | 1b1f49463fe44dfe1980f4f920e82b81c9b32932 /eclass | |
| parent | Fix for Bug #34872 (diff) | |
| download | gentoo-2-0c7dc4f0427e77709e505607bb6d2f7d90b83708.tar.gz gentoo-2-0c7dc4f0427e77709e505607bb6d2f7d90b83708.tar.bz2 gentoo-2-0c7dc4f0427e77709e505607bb6d2f7d90b83708.zip | |
fix bug #37623 in a different way
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/php-2.eclass | 4 | ||||
| -rw-r--r-- | eclass/php-sapi.eclass | 5 | ||||
| -rw-r--r-- | eclass/php.eclass | 4 |
3 files changed, 10 insertions, 3 deletions
diff --git a/eclass/php-2.eclass b/eclass/php-2.eclass index 6aa2c778f6ea..72d616e7cf78 100644 --- a/eclass/php-2.eclass +++ b/eclass/php-2.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-2.eclass,v 1.12 2004/01/08 10:04:25 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php-2.eclass,v 1.13 2004/01/08 22:04:10 robbat2 Exp $ # Author: Robin H. Johnson <robbat2@gentoo.org> inherit eutils flag-o-matic @@ -195,6 +195,8 @@ php_src_unpack() { # we keep a backup of it as we need it at the end of the install #cp pear/PEAR/Registry.php pear/PEAR/Registry.old #sed -e "s:\$pear_install_dir\.:\'${D}/usr/lib/php/\' . :g" -i pear/PEAR/Registry.php + + sed -e 's|include/postgresql|include/postgresql include/postgresql/pgsql|g' -i configure } diff --git a/eclass/php-sapi.eclass b/eclass/php-sapi.eclass index 483a371a9122..c5ca8a086004 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.3 2004/01/08 07:23:53 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php-sapi.eclass,v 1.4 2004/01/08 22:04:10 robbat2 Exp $ # Author: Robin H. Johnson <robbat2@gentoo.org> inherit eutils flag-o-matic @@ -217,6 +217,9 @@ php-sapi_src_unpack() { # we keep a backup of it as we need it at the end of the install #cp pear/PEAR/Registry.php pear/PEAR/Registry.old #sed -e "s:\$pear_install_dir\.:\'${D}/usr/lib/php/\' . :g" -i pear/PEAR/Registry.php + + sed -e 's|include/postgresql|include/postgresql include/postgresql/pgsql|g' -i configure + } diff --git a/eclass/php.eclass b/eclass/php.eclass index 9c6f54365479..9fd94f6dcb49 100644 --- a/eclass/php.eclass +++ b/eclass/php.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.eclass,v 1.96 2004/01/08 07:23:53 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php.eclass,v 1.97 2004/01/08 22:04:10 robbat2 Exp $ # Author: Robin H. Johnson <robbat2@gentoo.org> # This eclass is the old style of php, that was used before php-core was @@ -201,6 +201,8 @@ php_src_unpack() { [ "${MY_PV}" = "4.3.4" ] && \ epatch ${DISTDIR}/php-4.3.4-phpizeexecfix.patch + + sed -e 's|include/postgresql|include/postgresql include/postgresql/pgsql|g' -i configure } |