diff options
| author |   Luca Longinotti <chtekk@gentoo.org> | 2006-04-20 12:15:35 +0000 |
|---|---|---|
| committer | Luca Longinotti <chtekk@gentoo.org> | 2006-04-20 12:15:35 +0000 |
| commit | e4e919e015ecc3308b17e0cc1133d8ca64b41a29 (patch) | |
| tree | e7700ab27fb8053f20079159b42a9fbbc7105b45 /eclass/php5_1-sapi.eclass | |
| parent | Moved setup code to pkg_setup, hopefully fixing bug #130553. (diff) | |
| download | gentoo-2-e4e919e015ecc3308b17e0cc1133d8ca64b41a29.tar.gz gentoo-2-e4e919e015ecc3308b17e0cc1133d8ca64b41a29.tar.bz2 gentoo-2-e4e919e015ecc3308b17e0cc1133d8ca64b41a29.zip | |
Don't die on USE=-*, eclass part.
Diffstat (limited to 'eclass/php5_1-sapi.eclass')
| -rw-r--r-- | eclass/php5_1-sapi.eclass | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/eclass/php5_1-sapi.eclass b/eclass/php5_1-sapi.eclass index 7b6281f1b9f7..2faadf292e4e 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.22 2006/04/18 22:29:31 chtekk Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php5_1-sapi.eclass,v 1.23 2006/04/20 12:15:35 chtekk Exp $ # # ######################################################################## # @@ -150,8 +150,6 @@ EXPORT_FUNCTIONS pkg_setup src_compile src_install src_unpack pkg_postinst # ======================================================================== php5_1-sapi_check_use_flags() { - PHPCONFUTILS_AUTO_USE="" - # Multiple USE dependencies phpconfutils_use_depend_any "truetype" "gd" "gd" "gd-external" phpconfutils_use_depend_any "cjk" "gd" "gd" "gd-external" @@ -649,7 +647,7 @@ php5_1-sapi_pkg_postinst() { fi # Create the symlinks for php-cli - if useq cli ; then + if useq cli || phpconfutils_usecheck cli ; then "${ROOT}/usr/sbin/php-select" -t php php5 > /dev/null 2>&1 exitStatus=$? if [[ ${exitStatus} == 5 ]] ; then |