From: Georgy Yakovlev <gyakovlev@gentoo.org>
Date: Sat, 23 Feb 2019 20:21:45 +0000 (-0800)
Subject: dev-java/openjdk: unset _JAVA_OPTIONS before econf
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=95024cde4a946017684c37fbe99f1b1609ff6bf1;p=gentoo.git

dev-java/openjdk: unset _JAVA_OPTIONS before econf

Closes: https://bugs.gentoo.org/677236
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
---

diff --git a/dev-java/openjdk/openjdk-11.0.1_p13.ebuild b/dev-java/openjdk/openjdk-11.0.1_p13.ebuild
index efa3a3ed2de5..b73dc4da11b7 100644
--- a/dev-java/openjdk/openjdk-11.0.1_p13.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.1_p13.ebuild
@@ -159,7 +159,7 @@ src_configure() {
 	# graphviz are detected. pandoc has loads of dependencies anyway.
 
 	(
-		unset JAVA JAVAC XARGS
+		unset _JAVA_OPTIONS JAVA JAVAC XARGS
 		CFLAGS= CXXFLAGS= LDFLAGS= \
 		CONFIG_SITE=/dev/null \
 		econf \
diff --git a/dev-java/openjdk/openjdk-11.0.2_p7.ebuild b/dev-java/openjdk/openjdk-11.0.2_p7.ebuild
index 1f86bff0e40a..b03e8a2da400 100644
--- a/dev-java/openjdk/openjdk-11.0.2_p7.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.2_p7.ebuild
@@ -108,7 +108,6 @@ pkg_setup() {
 		JDK_HOME=${JDK_HOME#*/}
 		JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*}
 		export JDK_HOME
-		unset _JAVA_OPTIONS
 	fi
 }
 
@@ -150,7 +149,7 @@ src_configure() {
 	fi
 
 	(
-		unset JAVA JAVAC XARGS
+		unset _JAVA_OPTIONS JAVA JAVAC XARGS
 		CFLAGS= CXXFLAGS= LDFLAGS= \
 		CONFIG_SITE=/dev/null \
 		econf "${myconf[@]}"
diff --git a/dev-java/openjdk/openjdk-8.202_p08.ebuild b/dev-java/openjdk/openjdk-8.202_p08.ebuild
index fd7a5d675a45..65196b1e29d7 100644
--- a/dev-java/openjdk/openjdk-8.202_p08.ebuild
+++ b/dev-java/openjdk/openjdk-8.202_p08.ebuild
@@ -123,7 +123,6 @@ pkg_setup() {
 		JDK_HOME=${JDK_HOME#*/}
 		JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*}
 		export JDK_HOME
-		unset _JAVA_OPTIONS
 	fi
 }
 
@@ -172,7 +171,7 @@ src_configure() {
 	fi
 
 	(
-		unset JAVA JAVAC XARGS
+		unset _JAVA_OPTIONS JAVA JAVAC XARGS
 		CFLAGS= CXXFLAGS= LDFLAGS= \
 		CONFIG_SITE=/dev/null \
 		econf "${myconf[@]}"