diff options
| author |   Christian Hoffmann <hoffie@gentoo.org> | 2008-05-09 13:02:04 +0000 |
|---|---|---|
| committer | Christian Hoffmann <hoffie@gentoo.org> | 2008-05-09 13:02:04 +0000 |
| commit | de691715a31d1ab01b6c455f3095f9650fdb6607 (patch) | |
| tree | 5bea5fd8dbeb8a84fad6d6871a25beb1fafbc2af /eclass | |
| parent | QA fixes for bug #220094 (diff) | |
| download | gentoo-2-de691715a31d1ab01b6c455f3095f9650fdb6607.tar.gz gentoo-2-de691715a31d1ab01b6c455f3095f9650fdb6607.tar.bz2 gentoo-2-de691715a31d1ab01b6c455f3095f9650fdb6607.zip | |
hopefully fixing bug 220519 (libtool-related php extension b0rkage)
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/php-ext-source-r1.eclass | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/eclass/php-ext-source-r1.eclass b/eclass/php-ext-source-r1.eclass index 6f2cd22c189d..c2a2d5a570be 100644 --- a/eclass/php-ext-source-r1.eclass +++ b/eclass/php-ext-source-r1.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r1.eclass,v 1.18 2008/05/09 12:35:05 hoffie Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r1.eclass,v 1.19 2008/05/09 13:02:04 hoffie Exp $ # # Author: Tal Peer <coredumb@gentoo.org> # Author: Stuart Herbert <stuart@gentoo.org> @@ -56,13 +56,13 @@ php-ext-source-r1_src_unpack() { # @DESCRIPTION: # Runs phpize and autotools in addition to the standard src_unpack php-ext-source-r1_phpize() { -# # Create configure out of config.m4 -# ${PHPIZE} -# # force run of libtoolize and regeneration of related autotools -# # files (bug 220519) -# rm aclocal.m4 -# eautoreconf - : + has_php + # Create configure out of config.m4 + ${PHPIZE} + # force run of libtoolize and regeneration of related autotools + # files (bug 220519) + rm aclocal.m4 + eautoreconf } # @FUNCTION: php-ext-source-r1_src_compile @@ -81,11 +81,6 @@ php-ext-source-r1_src_compile() { # Set the correct config options my_conf="--prefix=${PHPPREFIX} --with-php-config=${PHPCONFIG} ${my_conf}" - # Create configure out of config.m4 - if [[ "${PHP_EXT_SKIP_PHPIZE}" != 'yes' ]] ; then - ${PHPIZE} - fi - # Concurrent PHP Apache2 modules support if has_concurrentmodphp ; then append-ldflags "-Wl,--version-script=${ROOT}/var/lib/php-pkg/${PHP_PKG}/php${PHP_VERSION}-ldvs" |