diff options
| author |   Paul de Vrieze <pauldv@gentoo.org> | 2003-05-24 13:36:47 +0000 |
|---|---|---|
| committer | Paul de Vrieze <pauldv@gentoo.org> | 2003-05-24 13:36:47 +0000 |
| commit | ad5bfa9982951bc1cfa2551df07c5341fe39c99f (patch) | |
| tree | dda640199338a1b368c632b18791e07d8fd40982 /eclass | |
| parent | adding Manifest (diff) | |
| download | gentoo-2-ad5bfa9982951bc1cfa2551df07c5341fe39c99f.tar.gz gentoo-2-ad5bfa9982951bc1cfa2551df07c5341fe39c99f.tar.bz2 gentoo-2-ad5bfa9982951bc1cfa2551df07c5341fe39c99f.zip | |
php should still be able to use db4
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/php.eclass | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/eclass/php.eclass b/eclass/php.eclass index 94ea6cadf567..0bf5fa263bf6 100644 --- a/eclass/php.eclass +++ b/eclass/php.eclass @@ -1,7 +1,7 @@ # Copyright 2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later # Author: Robin H. Johnson <robbat2@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/eclass/php.eclass,v 1.22 2003/05/24 12:44:48 pauldv Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php.eclass,v 1.23 2003/05/24 13:36:47 pauldv Exp $ # This EBUILD is totally masked presently. Use it at your own risk. I know it # is severely broken, but I needed to get a copy into CVS to pass around and @@ -39,7 +39,7 @@ DEPEND="${DEPEND} sys-apps/bzip2 sys-libs/db X? ( virtual/x11 ) - berkdb? ( =sys-libs/db-3* ) + berkdb? ( >=sys-libs/db-3 ) crypt? ( >=dev-libs/libmcrypt-2.4 >=app-crypt/mhash-0.8 ) curl? ( >=net-ftp/curl-7.10.2 ) firebird? ( >=dev-db/firebird-1.0 ) @@ -48,7 +48,7 @@ DEPEND="${DEPEND} gd? ( media-libs/libgd >=media-libs/jpeg-6b >=media-libs/libpng-1.2.5 ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) imap? ( >=net-mail/uw-imap-2001a-r1 ) - java? ( =virtual/jdk-1.4* dev-java/java-config ) + java? ( >=virtual/jdk-1.4 ) jpeg? ( >=media-libs/jpeg-6b ) ldap? ( >=net-nds/openldap-1.2.11 ) mcal? ( dev-libs/libmcal ) @@ -186,16 +186,6 @@ php_src_compile() { # *) myconf="${myconf} --disable-embed" ;; # esac; - if [ -n "`use java`" ]; then - JAVAVER=`java-config --java-version 2>&1|grep -i 'version' | xargs -n1 |grep '\.'|cut -c1-3` - einfo "JDK ${JAVAVER}.* detected" - if [ "${JAVAVER}" != "1.4" ]; then - ERRORMSG="Please use java-config to select a 1.4 JDK" - eerror ${ERRORMSG} - die ${ERRORMSG} - fi; - fi - [ -x "/usr/sbin/sendmail" ] || die "You need a virtual/mta that provides /usr/sbin/sendmail!" use berkdb && myconf="${myconf} --with-db3=/usr" @@ -207,7 +197,7 @@ php_src_compile() { use gd && myconf="${myconf} --with-gd=/usr" use gdbm && myconf="${myconf} --with-gdbm=/usr" use informix && [ -n "${INFORMIXDIR}" ] && myconf="${myconf} --with-informix=${INFORMIXDIR}" - use java && myconf="${myconf} --with-java=${JAVA_HOME}" || myconf="${myconf} --without-java" + use java && myconf="${myconf} --with-java=${JAVA_HOME}" use jpeg && myconf="${myconf} --with-jpeg --with-jpeg-dir=/usr --enable-exif" || myconf="${myconf} --without-jpeg" use jpeg && LDFLAGS="${LDFLAGS} -ljpeg" use mcal && myconf="${myconf} --with-mcal=/usr" |