[gentoo-commits] gentoo-x86 commit in eclass: php-ext-source-r1.eclass

[Christian Hoffmann (hoffie)]

hoffie      08/05/09 13:02:04

  Modified:             php-ext-source-r1.eclass
  Log:
  hopefully fixing bug 220519 (libtool-related php extension b0rkage)

Revision  Changes    Path
1.19                 eclass/php-ext-source-r1.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php-ext-source-r1.eclass?rev=1.19&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php-ext-source-r1.eclass?rev=1.19&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php-ext-source-r1.eclass?r1=1.18&r2=1.19

Index: php-ext-source-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r1.eclass,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- php-ext-source-r1.eclass	9 May 2008 12:35:05 -0000	1.18
+++ php-ext-source-r1.eclass	9 May 2008 13:02:04 -0000	1.19
@@ -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@g.o>
 # Author: Stuart Herbert <stuart@g.o>
@@ -56,13 +56,13 @@
 # @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 @@
 	# 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"



-- 
gentoo-commits@l.g.o mailing list