| 1 |
commit: 95024cde4a946017684c37fbe99f1b1609ff6bf1 |
| 2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Feb 23 20:21:45 2019 +0000 |
| 4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Feb 23 20:25:18 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95024cde |
| 7 |
|
| 8 |
dev-java/openjdk: unset _JAVA_OPTIONS before econf |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/677236 |
| 11 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
| 12 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
| 13 |
|
| 14 |
dev-java/openjdk/openjdk-11.0.1_p13.ebuild | 2 +- |
| 15 |
dev-java/openjdk/openjdk-11.0.2_p7.ebuild | 3 +-- |
| 16 |
dev-java/openjdk/openjdk-8.202_p08.ebuild | 3 +-- |
| 17 |
3 files changed, 3 insertions(+), 5 deletions(-) |
| 18 |
|
| 19 |
diff --git a/dev-java/openjdk/openjdk-11.0.1_p13.ebuild b/dev-java/openjdk/openjdk-11.0.1_p13.ebuild |
| 20 |
index efa3a3ed2de..b73dc4da11b 100644 |
| 21 |
--- a/dev-java/openjdk/openjdk-11.0.1_p13.ebuild |
| 22 |
+++ b/dev-java/openjdk/openjdk-11.0.1_p13.ebuild |
| 23 |
@@ -159,7 +159,7 @@ src_configure() { |
| 24 |
# graphviz are detected. pandoc has loads of dependencies anyway. |
| 25 |
|
| 26 |
( |
| 27 |
- unset JAVA JAVAC XARGS |
| 28 |
+ unset _JAVA_OPTIONS JAVA JAVAC XARGS |
| 29 |
CFLAGS= CXXFLAGS= LDFLAGS= \ |
| 30 |
CONFIG_SITE=/dev/null \ |
| 31 |
econf \ |
| 32 |
|
| 33 |
diff --git a/dev-java/openjdk/openjdk-11.0.2_p7.ebuild b/dev-java/openjdk/openjdk-11.0.2_p7.ebuild |
| 34 |
index 1f86bff0e40..b03e8a2da40 100644 |
| 35 |
--- a/dev-java/openjdk/openjdk-11.0.2_p7.ebuild |
| 36 |
+++ b/dev-java/openjdk/openjdk-11.0.2_p7.ebuild |
| 37 |
@@ -108,7 +108,6 @@ pkg_setup() { |
| 38 |
JDK_HOME=${JDK_HOME#*/} |
| 39 |
JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*} |
| 40 |
export JDK_HOME |
| 41 |
- unset _JAVA_OPTIONS |
| 42 |
fi |
| 43 |
} |
| 44 |
|
| 45 |
@@ -150,7 +149,7 @@ src_configure() { |
| 46 |
fi |
| 47 |
|
| 48 |
( |
| 49 |
- unset JAVA JAVAC XARGS |
| 50 |
+ unset _JAVA_OPTIONS JAVA JAVAC XARGS |
| 51 |
CFLAGS= CXXFLAGS= LDFLAGS= \ |
| 52 |
CONFIG_SITE=/dev/null \ |
| 53 |
econf "${myconf[@]}" |
| 54 |
|
| 55 |
diff --git a/dev-java/openjdk/openjdk-8.202_p08.ebuild b/dev-java/openjdk/openjdk-8.202_p08.ebuild |
| 56 |
index fd7a5d675a4..65196b1e29d 100644 |
| 57 |
--- a/dev-java/openjdk/openjdk-8.202_p08.ebuild |
| 58 |
+++ b/dev-java/openjdk/openjdk-8.202_p08.ebuild |
| 59 |
@@ -123,7 +123,6 @@ pkg_setup() { |
| 60 |
JDK_HOME=${JDK_HOME#*/} |
| 61 |
JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*} |
| 62 |
export JDK_HOME |
| 63 |
- unset _JAVA_OPTIONS |
| 64 |
fi |
| 65 |
} |
| 66 |
|
| 67 |
@@ -172,7 +171,7 @@ src_configure() { |
| 68 |
fi |
| 69 |
|
| 70 |
( |
| 71 |
- unset JAVA JAVAC XARGS |
| 72 |
+ unset _JAVA_OPTIONS JAVA JAVAC XARGS |
| 73 |
CFLAGS= CXXFLAGS= LDFLAGS= \ |
| 74 |
CONFIG_SITE=/dev/null \ |
| 75 |
econf "${myconf[@]}" |
Archives