diff options
| author |   Stuart Herbert <stuart@gentoo.org> | 2004-05-18 23:04:45 +0000 |
|---|---|---|
| committer | Stuart Herbert <stuart@gentoo.org> | 2004-05-18 23:04:45 +0000 |
| commit | 8f08af97b241c0fb7c5e458404e0c8f19c429ea9 (patch) | |
| tree | 0de31841311b1c67ded12b0f4a6bdf7653a82bea /eclass | |
| parent | Looks at the right tarball now (Manifest recommit) (diff) | |
| download | gentoo-2-8f08af97b241c0fb7c5e458404e0c8f19c429ea9.tar.gz gentoo-2-8f08af97b241c0fb7c5e458404e0c8f19c429ea9.tar.bz2 gentoo-2-8f08af97b241c0fb7c5e458404e0c8f19c429ea9.zip | |
Improved support for hardened-php patch
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/php-sapi.eclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/eclass/php-sapi.eclass b/eclass/php-sapi.eclass index 57b86b14ff09..7d3aa18e6545 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.24 2004/05/17 23:30:11 stuart Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php-sapi.eclass,v 1.25 2004/05/18 23:04:45 stuart Exp $ # Author: Robin H. Johnson <robbat2@gentoo.org> inherit eutils flag-o-matic @@ -46,7 +46,7 @@ IUSE="${IUSE} X crypt curl firebird flash freetds gd gd-external gdbm imap infor # Hardened-PHP support HARDENEDPHP_PATCH="hardened-php-4.3.6-0.1.1.patch.gz" -use hardenedphp && SRC_URI="$SRC_URI http://www.hardened-php.net/$HARDENEDPHP_PATCH" +[ `use hardenedphp` ] && SRC_URI="${SRC_URI} http://www.hardened-php.net/$HARDENEDPHP_PATCH" # berkdb stuff is complicated # we need db-1.* for ndbm @@ -253,7 +253,7 @@ php-sapi_src_unpack() { # bug 47498 [ "${PV//4.3.6}" != "${PV}" ] && EPATCH_OPTS="-d ${S} -p1" epatch ${DISTDIR}/php-4.3.6-pcrealloc.patch - use hardenedphp && epatch ${DISTDIR}/${HARDENEDPHP_PATCH} + [ `use hardenedphp` ] && epatch ${DISTDIR}/${HARDENEDPHP_PATCH} } |