summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorChristian Hoffmann <hoffie@gentoo.org>2008-05-09 12:35:05 +0000
committerChristian Hoffmann <hoffie@gentoo.org>2008-05-09 12:35:05 +0000
commitb9ffd603e3870ff6abbe62a6105f42ed44ff8b2c (patch)
tree5c79772539e5e6dc1fd8bb273686631958b12df4 /eclass
parentfixes compilation error with GCC 4.3.0 - closes bug 219548 (diff)
downloadgentoo-2-b9ffd603e3870ff6abbe62a6105f42ed44ff8b2c.tar.gz
gentoo-2-b9ffd603e3870ff6abbe62a6105f42ed44ff8b2c.tar.bz2
gentoo-2-b9ffd603e3870ff6abbe62a6105f42ed44ff8b2c.zip
yet another transition change for bug 220519
Diffstat (limited to 'eclass')
-rw-r--r--eclass/php-ext-source-r1.eclass45
1 files changed, 23 insertions, 22 deletions
diff --git a/eclass/php-ext-source-r1.eclass b/eclass/php-ext-source-r1.eclass
index 10b526730860..6f2cd22c189d 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.17 2008/05/07 16:07:57 hoffie Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r1.eclass,v 1.18 2008/05/09 12:35:05 hoffie Exp $
#
# Author: Tal Peer <coredumb@gentoo.org>
# Author: Stuart Herbert <stuart@gentoo.org>
@@ -37,37 +37,38 @@ RDEPEND=""
# @FUNCTION: php-ext-source-r1_src_unpack
# @DESCRIPTION:
-# Default src_unpack to allow for moving the phpize call to src_unpack
-# gracefully (we need to fix all ebuilds to explicitly run src_unpack if
-# they have their own)
-## Runs phpize and autotools in addition to the standard src_unpack
-##
-## @VARIABLE: PHP_EXT_SKIP_PHPIZE
-## @DESCRIPTION:
-## phpize will be run by default for all ebuilds that use php-ext-source-r1_src_compile.
-## Set PHP_EXT_SKIP_PHPIZE="yes" in your ebuild if you do not want to run phpize.
+# runs standard src_unpack + _phpize
+#
+# @VARIABLE: PHP_EXT_SKIP_PHPIZE
+# @DESCRIPTION:
+# phpize will be run by default for all ebuilds that use
+# php-ext-source-r1_src_unpack
+# Set PHP_EXT_SKIP_PHPIZE="yes" in your ebuild if you do not want to run phpize.
php-ext-source-r1_src_unpack() {
unpack ${A}
cd "${S}"
+ if [[ "${PHP_EXT_SKIP_PHPIZE}" != 'yes' ]] ; then
+ php-ext-source-r1_phpize
+ fi
+}
+
+# @FUNCTION php-ext-source-r1_phpize
+# @DESCRIPTION:
+# Runs phpize and autotools in addition to the standard src_unpack
+php-ext-source-r1_phpize() {
# # Create configure out of config.m4
-# if [[ "${PHP_EXT_SKIP_PHPIZE}" != 'yes' ]] ; then
-# ${PHPIZE}
-# # force run of libtoolize and regeneration of related autotools
-# # files (bug 220519)
-# rm aclocal.m4
-# eautoreconf
-# fi
+# ${PHPIZE}
+# # force run of libtoolize and regeneration of related autotools
+# # files (bug 220519)
+# rm aclocal.m4
+# eautoreconf
+ :
}
# @FUNCTION: php-ext-source-r1_src_compile
# @DESCRIPTION:
# Takes care of standard compile for PHP extensions (modules).
-# @VARIABLE: PHP_EXT_SKIP_PHPIZE
-# @DESCRIPTION:
-# phpize will be run by default for all ebuilds that use php-ext-source-r1_src_compile.
-# Set PHP_EXT_SKIP_PHPIZE="yes" in your ebuild if you do not want to run phpize.
-
# @VARIABLE: my_conf
# @DESCRIPTION:
# Set this in the ebuild to pass configure options to econf.