Skip to content

Commit

Permalink
dev-java/openjdk: unset _JAVA_OPTIONS before econf
Browse files Browse the repository at this point in the history
Closes: https://bugs.gentoo.org/677236
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Georgy Yakovlev <[email protected]>
  • Loading branch information
gyakovlev committed Feb 23, 2019
1 parent cb09216 commit 95024cd
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion dev-java/openjdk/openjdk-11.0.1_p13.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
3 changes: 1 addition & 2 deletions dev-java/openjdk/openjdk-11.0.2_p7.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,6 @@ pkg_setup() {
JDK_HOME=${JDK_HOME#*/}
JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*}
export JDK_HOME
unset _JAVA_OPTIONS
fi
}

Expand Down Expand Up @@ -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[@]}"
Expand Down
3 changes: 1 addition & 2 deletions dev-java/openjdk/openjdk-8.202_p08.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,6 @@ pkg_setup() {
JDK_HOME=${JDK_HOME#*/}
JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*}
export JDK_HOME
unset _JAVA_OPTIONS
fi
}

Expand Down Expand Up @@ -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[@]}"
Expand Down

0 comments on commit 95024cd

Please sign in to comment.