diff options
| author |   Stefan Jones <cretin@gentoo.org> | 2002-11-11 19:19:03 +0000 |
|---|---|---|
| committer | Stefan Jones <cretin@gentoo.org> | 2002-11-11 19:19:03 +0000 |
| commit | 7e86a19a0b836d63ffdbd54df84a7216831e0cf2 (patch) | |
| tree | a233a711c32862ed0de82ef9516a097a50398bc9 /dev-java/sun-j2sdk | |
| parent | Added "DEFINE LATIN1 ON" to include/config.h (bug #10332) (diff) | |
| download | historical-7e86a19a0b836d63ffdbd54df84a7216831e0cf2.tar.gz historical-7e86a19a0b836d63ffdbd54df84a7216831e0cf2.tar.bz2 historical-7e86a19a0b836d63ffdbd54df84a7216831e0cf2.zip | |
java version check
Diffstat (limited to 'dev-java/sun-j2sdk')
| -rw-r--r-- | dev-java/sun-j2sdk/ChangeLog | 10 | ||||
| -rw-r--r-- | dev-java/sun-j2sdk/sun-j2sdk-1.4.0-r1.ebuild | 13 |
2 files changed, 19 insertions, 4 deletions
diff --git a/dev-java/sun-j2sdk/ChangeLog b/dev-java/sun-j2sdk/ChangeLog index 971e3318caed..25dbf87af590 100644 --- a/dev-java/sun-j2sdk/ChangeLog +++ b/dev-java/sun-j2sdk/ChangeLog @@ -1,14 +1,18 @@ # ChangeLog for dev-java/sun-jdk # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2sdk/ChangeLog,v 1.3 2002/11/09 19:52:54 cretin Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2sdk/ChangeLog,v 1.4 2002/11/11 19:19:03 cretin Exp $ *sun-j2sdk-1.4.0-r1 (07 Nov 2002) - 09 Nov 2002; Stefan A. Jones <cretin@gentoo.org> sun-j2sdk-1.4.0-r1.ebuild + 11 Nov 2002; Stefan A. Jones <cretin@gentoo.org> sun-j2sdk-1.4.0-r1.ebuild: + + Added some checks for valid versions of jdk and OTHER_C(XX)FLAGS hint. + + 09 Nov 2002; Stefan A. Jones <cretin@gentoo.org> sun-j2sdk-1.4.0-r1.ebuild: Fixed bugs #10489 and #10485 with luck - 07 Nov 2002; Stefan A. Jones <cretin@gentoo.org> sun-j2sdk-1.4.0-r1.ebuild + 07 Nov 2002; Stefan A. Jones <cretin@gentoo.org> sun-j2sdk-1.4.0-r1.ebuild: This *should* work, please test and fix, and report abuse to me! diff --git a/dev-java/sun-j2sdk/sun-j2sdk-1.4.0-r1.ebuild b/dev-java/sun-j2sdk/sun-j2sdk-1.4.0-r1.ebuild index 2e3f0d760e95..322a10c0ec4e 100644 --- a/dev-java/sun-j2sdk/sun-j2sdk-1.4.0-r1.ebuild +++ b/dev-java/sun-j2sdk/sun-j2sdk-1.4.0-r1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # Maintainer: Stefan Jones <cretin@gentoo.org> # Author: Stefan Jones <cretin@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2sdk/sun-j2sdk-1.4.0-r1.ebuild,v 1.7 2002/11/11 10:05:06 cretin Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2sdk/sun-j2sdk-1.4.0-r1.ebuild,v 1.8 2002/11/11 19:19:03 cretin Exp $ # Based on http://tushar.lfsforum.org/javafromscratch.txt (LFS) # By Tushar Teredesai <Tush@Yahoo.Com> @@ -54,6 +54,15 @@ pkg_setup() { eerror "it seems you don't have that much, quiting, sorry!" die "Not enough disk space" fi + + #Check the Current java-version ~ 1.4 and is jdk + java-config --javac > /dev/null 2>&1 || die "The version of java set by java-config doesn't contain javac" + + if [ `java-config --java-version 2>&1 | grep "1\.4\." | wc -l` -lt 1 ] ; then + eerror "JDK is too old, >= 1.4 is required" + die "The version of jdk pointed to by java-config is not >=1.4" + fi + } src_unpack() { @@ -110,6 +119,8 @@ src_compile () { # Any CFLAGS will cause the build to fail! # If you don't believe me ... + #export OTHER_CFLAGS=${CFLAGS} + #export OTHER_CXXFLAGS=${CXXFLAGS} unset CFLAGS CXXFLAGS export ALT_MOZILLA_PATH="${S}/mozilla" |