summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorPetteri Räty <betelgeuse@gentoo.org>2007-11-26 21:00:59 +0000
committerPetteri Räty <betelgeuse@gentoo.org>2007-11-26 21:00:59 +0000
commit93b19380bc6e82010ae7d6585007a97044ea934a (patch)
tree38086baa09e245579d8a5828d7d3edac30ff9a56 /eclass
parentNew meta for pulling in gst plugins (diff)
downloadgentoo-2-93b19380bc6e82010ae7d6585007a97044ea934a.tar.gz
gentoo-2-93b19380bc6e82010ae7d6585007a97044ea934a.tar.bz2
gentoo-2-93b19380bc6e82010ae7d6585007a97044ea934a.zip
Can't use export with JAVA_OPTIONS so just put back the unset. The warning given to users should be enough even if the unset does not currently work.
Diffstat (limited to 'eclass')
-rw-r--r--eclass/java-utils-2.eclass6
1 files changed, 4 insertions, 2 deletions
diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass
index b98e12956862..c3e687a74251 100644
--- a/eclass/java-utils-2.eclass
+++ b/eclass/java-utils-2.eclass
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.97 2007/11/26 20:38:26 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.98 2007/11/26 21:00:59 betelgeuse Exp $
# -----------------------------------------------------------------------------
# @eclass-begin
@@ -2067,7 +2067,9 @@ java-pkg_init() {
fi
if [[ -z ${accept} ]]; then
- export _JAVA_OPTIONS=
+ # export _JAVA_OPTIONS= doesn't work because it will show up in java
+ # -version output
+ unset _JAVA_OPTIONS
# phase hooks make this run many times without this
I_WANT_GLOBAL_JAVA_OPTIONS="true"
fi