summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Le Cuirot <chewi@gentoo.org>2017-06-27 13:44:30 +0100
committerJames Le Cuirot <chewi@gentoo.org>2017-06-27 13:45:34 +0100
commit5bdaba55c74006e658e44e396e31a1a62b440698 (patch)
tree9c4d1fe0e3a42c2c7cebaf1867f885444ae7a8de /dev-java/gcj-jdk
parentdev-java/gcj-jdk: Remove 4.9.4 now that GCC 5 is stable (diff)
downloadgentoo-5bdaba55c74006e658e44e396e31a1a62b440698.tar.gz
gentoo-5bdaba55c74006e658e44e396e31a1a62b440698.tar.bz2
gentoo-5bdaba55c74006e658e44e396e31a1a62b440698.zip
dev-java/gcj-jdk: Fix JAVA_HOME on systems with SYMLINK_LIB="no"
Package-Manager: Portage-2.3.6, Repoman-2.3.2
Diffstat (limited to 'dev-java/gcj-jdk')
-rw-r--r--dev-java/gcj-jdk/files/gcj-jdk.env.sh4
-rw-r--r--dev-java/gcj-jdk/gcj-jdk-5.4.0-r1.ebuild (renamed from dev-java/gcj-jdk/gcj-jdk-5.4.0.ebuild)2
2 files changed, 3 insertions, 3 deletions
diff --git a/dev-java/gcj-jdk/files/gcj-jdk.env.sh b/dev-java/gcj-jdk/files/gcj-jdk.env.sh
index 97ef10ed596..ff967fa2c1c 100644
--- a/dev-java/gcj-jdk/files/gcj-jdk.env.sh
+++ b/dev-java/gcj-jdk/files/gcj-jdk.env.sh
@@ -2,8 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
VERSION="GCJ ${PV}"
-JAVA_HOME="${EPREFIX}/usr/lib/${P}"
-JDK_HOME="${EPREFIX}/usr/lib/${P}"
+JAVA_HOME="${EPREFIX}/usr/$(get_libdir)/${P}"
+JDK_HOME="${EPREFIX}/usr/$(get_libdir)/${P}"
JAVAC="\${JAVA_HOME}/bin/javac"
PATH="\${JAVA_HOME}/bin"
ROOTPATH="\${JAVA_HOME}/bin"
diff --git a/dev-java/gcj-jdk/gcj-jdk-5.4.0.ebuild b/dev-java/gcj-jdk/gcj-jdk-5.4.0-r1.ebuild
index 13821c4840e..c56dd496f7c 100644
--- a/dev-java/gcj-jdk/gcj-jdk-5.4.0.ebuild
+++ b/dev-java/gcj-jdk/gcj-jdk-5.4.0-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-inherit java-vm-2 multilib
+inherit java-vm-2
DESCRIPTION="Java wrappers around GCJ"
HOMEPAGE="https://www.gentoo.org/"