diff options
| author |   Joshua Nichols <nichoj@gentoo.org> | 2006-09-04 00:21:17 +0000 |
|---|---|---|
| committer | Joshua Nichols <nichoj@gentoo.org> | 2006-09-04 00:21:17 +0000 |
| commit | 31ff08375ccd1db8e22da393ae360911d000e5aa (patch) | |
| tree | f254ce66063939922c9a2559f0c9ab9b9ecc79a5 /eclass/java-pkg.eclass | |
| parent | Make it pick the right defconfig (diff) | |
| download | historical-31ff08375ccd1db8e22da393ae360911d000e5aa.tar.gz historical-31ff08375ccd1db8e22da393ae360911d000e5aa.tar.bz2 historical-31ff08375ccd1db8e22da393ae360911d000e5aa.zip | |
Now setts JAVAC and JAVA. This should fix bug #145632
Diffstat (limited to 'eclass/java-pkg.eclass')
| -rw-r--r-- | eclass/java-pkg.eclass | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/eclass/java-pkg.eclass b/eclass/java-pkg.eclass index 19b1e251fad5..562764e446dc 100644 --- a/eclass/java-pkg.eclass +++ b/eclass/java-pkg.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/java-pkg.eclass,v 1.42 2006/09/01 03:02:14 nichoj Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/java-pkg.eclass,v 1.43 2006/09/04 00:21:17 nichoj Exp $ inherit multilib @@ -73,12 +73,18 @@ initialize-java-home() { # use java-config-2, with GENTOO_VM set to generation-1 system vm, to # setup JAVA_HOME export JAVA_HOME=$(java-config-2 --jdk-home) + export JDK_HOME=$(java-config-2 --jdk-home) + # make sure JAVAC and JAVA are set correctly + export JAVAC=$(java-config-2 --javac) + export JAVA=$(java-config-2 --java) fi # Otherwise, JAVA_HOME should be defined already } # These are pre hooks to make sure JAVA_HOME is set properly. # note: don't need pkg_setup, since we define it here +# FIXME remove these hooks after portage-2.1.1 is stable, as +# it has proper env saving pre_src_unpack() { initialize-java-home } @@ -104,7 +110,6 @@ pre_pkg_postinst() { } - pkglistpath="${T}/java-pkg-list" java-pkg_doclass() |