diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2004-04-21 00:37:20 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2004-04-21 00:37:20 +0000 |
| commit | ebe4df09aa2a4a49d8c6f0e98d9bdf461daee05e (patch) | |
| tree | 59013135aa04b9beabd62765cda89d8a6c2c5999 /eclass/php-sapi.eclass | |
| parent | pcre fix bug #47498 (diff) | |
| download | historical-ebe4df09aa2a4a49d8c6f0e98d9bdf461daee05e.tar.gz historical-ebe4df09aa2a4a49d8c6f0e98d9bdf461daee05e.tar.bz2 historical-ebe4df09aa2a4a49d8c6f0e98d9bdf461daee05e.zip | |
pcre fix bug #47498
Diffstat (limited to 'eclass/php-sapi.eclass')
| -rw-r--r-- | eclass/php-sapi.eclass | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/eclass/php-sapi.eclass b/eclass/php-sapi.eclass index 211514b7e365..17cb37a4890f 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.19 2004/04/01 08:32:06 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php-sapi.eclass,v 1.20 2004/04/21 00:37:20 robbat2 Exp $ # Author: Robin H. Johnson <robbat2@gentoo.org> inherit eutils flag-o-matic @@ -36,6 +36,8 @@ if [ "${PHPSAPI}" != "cli" ]; then SRC_URI="${SRC_URI} mirror://gentoo/php-4.3.2-fopen-url-secure.patch" fi +[ "${PV//4.3.6}" != "${PV}" ] && SRC_URI="${SRC_URI} http://www.apache.org/~jorton/php-4.3.6-pcrealloc.patch" + # Where we work S=${WORKDIR}/${MY_P} @@ -241,6 +243,9 @@ php-sapi_src_unpack() { sed -e 's|include/postgresql|include/postgresql include/postgresql/pgsql|g' -i configure + # bug 47498 + [ "${PV//4.3.6}" != "${PV}" ] && EPATCH_OPTS="-d ${S} -p1" epatch ${DISTDIR}/php-4.3.6-pcrealloc.patch + } @@ -454,6 +459,8 @@ php-sapi_src_compile() { --enable-versioning \ --with-config-file-path=${PHPINIDIRECTORY}" + php-sapi_is_providerbuild || myconf="${myconf} --without-pear" + #fixes bug #24373 filter-flags "-D_FILE_OFFSET_BITS=64" filter-flags "-D_FILE_OFFSET_BITS=32" |