diff options
| author |   Luca Longinotti <chtekk@gentoo.org> | 2006-05-18 16:40:21 +0000 |
|---|---|---|
| committer | Luca Longinotti <chtekk@gentoo.org> | 2006-05-18 16:40:21 +0000 |
| commit | 2b958d7bf82d11facd6ac6581b6888c3dcd738ed (patch) | |
| tree | 0f05c31f88d5c30d026e7f54127054d7a225803c /eclass | |
| parent | Removed obsolete version (diff) | |
| download | gentoo-2-2b958d7bf82d11facd6ac6581b6888c3dcd738ed.tar.gz gentoo-2-2b958d7bf82d11facd6ac6581b6888c3dcd738ed.tar.bz2 gentoo-2-2b958d7bf82d11facd6ac6581b6888c3dcd738ed.zip | |
Fix bug #130974, tnx to Flameeyes for pointing it out.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/php4_4-sapi.eclass | 7 | ||||
| -rw-r--r-- | eclass/php5_0-sapi.eclass | 7 | ||||
| -rw-r--r-- | eclass/php5_1-sapi.eclass | 7 |
3 files changed, 15 insertions, 6 deletions
diff --git a/eclass/php4_4-sapi.eclass b/eclass/php4_4-sapi.eclass index ef6eef0db13c..301c292886d2 100644 --- a/eclass/php4_4-sapi.eclass +++ b/eclass/php4_4-sapi.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/php4_4-sapi.eclass,v 1.19 2006/04/22 22:14:34 chtekk Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php4_4-sapi.eclass,v 1.20 2006/05/18 16:40:21 chtekk Exp $ # # ######################################################################## # @@ -22,7 +22,7 @@ CONFUTILS_MISSING_DEPS="adabas birdstep db2 dbmaker empress empress-bcs esoob frontbase hyperwave-api informix interbase mnogosearch msql oci8 oracle7 ovrimos pfpro sapdb solid sybase sybase-ct" EBUILD_SUPPORTS_SHAREDEXT="1" -inherit flag-o-matic eutils phpconfutils libtool php-common-r1 +inherit flag-o-matic eutils phpconfutils libtool php-common-r1 toolchain-funcs # set MY_PHP_P in the ebuild @@ -526,6 +526,9 @@ php4_4-sapi_src_compile() { # Support user-passed configuration parameters [[ -z "${EXTRA_ECONF}" ]] && EXTRA_ECONF="" + # Set the correct compiler for cross-compilation + tc-export CC + # We don't use econf, because we need to override all of its settings ./configure --prefix=${destdir} --sysconfdir=/etc --cache-file=./config.cache ${my_conf} ${EXTRA_ECONF} || die "configure failed" emake || die "make failed" diff --git a/eclass/php5_0-sapi.eclass b/eclass/php5_0-sapi.eclass index 99af907b9315..6b6630ddb988 100644 --- a/eclass/php5_0-sapi.eclass +++ b/eclass/php5_0-sapi.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/php5_0-sapi.eclass,v 1.21 2006/04/22 22:14:35 chtekk Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php5_0-sapi.eclass,v 1.22 2006/05/18 16:40:21 chtekk Exp $ # # ######################################################################## # @@ -22,7 +22,7 @@ CONFUTILS_MISSING_DEPS="adabas birdstep db2 dbmaker empress empress-bcs esoob frontbase hyperwave-api informix interbase mnogosearch msql oci8 oracle7 ovrimos pfpro sapdb solid sybase sybase-ct" EBUILD_SUPPORTS_SHAREDEXT="1" -inherit flag-o-matic eutils phpconfutils libtool php-common-r1 +inherit flag-o-matic eutils phpconfutils libtool php-common-r1 toolchain-funcs # set MY_PHP_P in the ebuild @@ -514,6 +514,9 @@ php5_0-sapi_src_compile() { # Support user-passed configuration parameters [[ -z "${EXTRA_ECONF}" ]] && EXTRA_ECONF="" + # Set the correct compiler for cross-compilation + tc-export CC + # We don't use econf, because we need to override all of its settings ./configure --prefix=${destdir} --sysconfdir=/etc --cache-file=./config.cache ${my_conf} ${EXTRA_ECONF} || die "configure failed" emake || die "make failed" diff --git a/eclass/php5_1-sapi.eclass b/eclass/php5_1-sapi.eclass index 072fa95d23fb..12d22ea72a46 100644 --- a/eclass/php5_1-sapi.eclass +++ b/eclass/php5_1-sapi.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/php5_1-sapi.eclass,v 1.24 2006/04/22 22:14:35 chtekk Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php5_1-sapi.eclass,v 1.25 2006/05/18 16:40:21 chtekk Exp $ # # ######################################################################## # @@ -22,7 +22,7 @@ CONFUTILS_MISSING_DEPS="adabas birdstep db2 dbmaker empress empress-bcs esoob frontbase hyperwave-api informix interbase msql oci8 sapdb solid sybase sybase-ct" EBUILD_SUPPORTS_SHAREDEXT="1" -inherit flag-o-matic eutils phpconfutils libtool php-common-r1 +inherit flag-o-matic eutils phpconfutils libtool php-common-r1 toolchain-funcs # set MY_PHP_P in the ebuild @@ -566,6 +566,9 @@ php5_1-sapi_src_compile() { # Support user-passed configuration parameters [[ -z "${EXTRA_ECONF}" ]] && EXTRA_ECONF="" + # Set the correct compiler for cross-compilation + tc-export CC + # We don't use econf, because we need to override all of its settings ./configure --prefix=${destdir} --sysconfdir=/etc --cache-file=./config.cache ${my_conf} ${EXTRA_ECONF} || die "configure failed" emake || die "make failed" |