summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorgy Yakovlev <gyakovlev@gentoo.org>2019-02-23 12:21:45 -0800
committerGeorgy Yakovlev <gyakovlev@gentoo.org>2019-02-23 12:25:18 -0800
commit95024cde4a946017684c37fbe99f1b1609ff6bf1 (patch)
treeefe0800d7158b3af2909fd6190d84fd35b4df656
parentdev-perl/Data-Validate-Domain: stable 0.140.0 for hppa, bug #638696 (diff)
downloadgentoo-95024cde4a946017684c37fbe99f1b1609ff6bf1.tar.gz
gentoo-95024cde4a946017684c37fbe99f1b1609ff6bf1.tar.bz2
gentoo-95024cde4a946017684c37fbe99f1b1609ff6bf1.zip
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>
-rw-r--r--dev-java/openjdk/openjdk-11.0.1_p13.ebuild2
-rw-r--r--dev-java/openjdk/openjdk-11.0.2_p7.ebuild3
-rw-r--r--dev-java/openjdk/openjdk-8.202_p08.ebuild3
3 files changed, 3 insertions, 5 deletions
diff --git a/dev-java/openjdk/openjdk-11.0.1_p13.ebuild b/dev-java/openjdk/openjdk-11.0.1_p13.ebuild
index efa3a3ed2de..b73dc4da11b 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 1f86bff0e40..b03e8a2da40 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 fd7a5d675a4..65196b1e29d 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[@]}"