diff options
| author |   Benedikt Boehm <hollow@gentoo.org> | 2005-09-18 12:57:22 +0000 |
|---|---|---|
| committer | Benedikt Boehm <hollow@gentoo.org> | 2005-09-18 12:57:22 +0000 |
| commit | f279812a4441cf19ec5b2b0dd799367945bc0bd4 (patch) | |
| tree | 4e932bc71b7e35e43b6fd21730bdb192f9316257 /eclass/php-common-r1.eclass | |
| parent | Amule uses external crypto++ now (diff) | |
| download | gentoo-2-f279812a4441cf19ec5b2b0dd799367945bc0bd4.tar.gz gentoo-2-f279812a4441cf19ec5b2b0dd799367945bc0bd4.tar.bz2 gentoo-2-f279812a4441cf19ec5b2b0dd799367945bc0bd4.zip | |
php update
Diffstat (limited to 'eclass/php-common-r1.eclass')
| -rw-r--r-- | eclass/php-common-r1.eclass | 30 |
1 files changed, 8 insertions, 22 deletions
diff --git a/eclass/php-common-r1.eclass b/eclass/php-common-r1.eclass index ddc67edc1972..44feb4f5ef5d 100644 --- a/eclass/php-common-r1.eclass +++ b/eclass/php-common-r1.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/php-common-r1.eclass,v 1.1 2005/09/04 10:54:53 stuart Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php-common-r1.eclass,v 1.2 2005/09/18 12:57:22 hollow Exp $ # ######################################################################## # @@ -63,21 +63,9 @@ php_check_imap() { # there is now the PHP-Java-Bridge that works under both PHP4 and PHP5. # ######################################################################## -php_uses_java() { - if ! useq java ; then - return 1 - fi - - if useq alpha || useq amd64 ; then - return 1 - fi - - return 0 -} - php_check_java() { - if ! php_uses_java ; then - return + if ! useq java-internal ; then + return 1 fi JDKHOME="`java-config --jdk-home`" @@ -89,7 +77,6 @@ php_check_java() { # stuart@gentoo.org - 2003/05/18 # Kaffe JVM is not a drop-in replacement for the Sun JDK at this time - if echo ${JDKHOME} | grep kaffe > /dev/null 2>&1 ; then eerror eerror "PHP will not build using the Kaffe Java Virtual Machine." @@ -97,16 +84,15 @@ php_check_java() { eerror eerror "To build PHP without Java support, please re-run this emerge" eerror "and place the line:" - eerror " USE='-java'" + eerror " USE='-java-internal'" eerror "in front of your emerge command; e.g." - eerror " USE='-java' emerge mod_php" + eerror " USE='-java-internal' emerge =dev-lang/php-4*" eerror eerror "or edit your USE flags in /etc/make.conf" die "Kaffe JVM not supported" fi - JDKVER=$(java-config --java-version 2>&1 | awk '/^java version/ { print $3 -}' | xargs ) + JDKVER=$(java-config --java-version 2>&1 | awk '/^java version/ { print $3 }' | xargs ) einfo "Active JDK version: ${JDKVER}" case ${JDKVER} in 1.4.*) ;; @@ -116,8 +102,8 @@ php_check_java() { } php_install_java() { - if ! php_uses_java ; then - return + if ! useq java-internal ; then + return 1 fi # we put these into /usr/lib so that they cannot conflict with |