| 1 |
commit: 5bdaba55c74006e658e44e396e31a1a62b440698 |
| 2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jun 27 12:44:30 2017 +0000 |
| 4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jun 27 12:45:34 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bdaba55 |
| 7 |
|
| 8 |
dev-java/gcj-jdk: Fix JAVA_HOME on systems with SYMLINK_LIB="no" |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
| 11 |
|
| 12 |
dev-java/gcj-jdk/files/gcj-jdk.env.sh | 4 ++-- |
| 13 |
dev-java/gcj-jdk/{gcj-jdk-5.4.0.ebuild => gcj-jdk-5.4.0-r1.ebuild} | 2 +- |
| 14 |
2 files changed, 3 insertions(+), 3 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-java/gcj-jdk/files/gcj-jdk.env.sh b/dev-java/gcj-jdk/files/gcj-jdk.env.sh |
| 17 |
index 97ef10ed596..ff967fa2c1c 100644 |
| 18 |
--- a/dev-java/gcj-jdk/files/gcj-jdk.env.sh |
| 19 |
+++ b/dev-java/gcj-jdk/files/gcj-jdk.env.sh |
| 20 |
@@ -2,8 +2,8 @@ |
| 21 |
# Distributed under the terms of the GNU General Public License v2 |
| 22 |
|
| 23 |
VERSION="GCJ ${PV}" |
| 24 |
-JAVA_HOME="${EPREFIX}/usr/lib/${P}" |
| 25 |
-JDK_HOME="${EPREFIX}/usr/lib/${P}" |
| 26 |
+JAVA_HOME="${EPREFIX}/usr/$(get_libdir)/${P}" |
| 27 |
+JDK_HOME="${EPREFIX}/usr/$(get_libdir)/${P}" |
| 28 |
JAVAC="\${JAVA_HOME}/bin/javac" |
| 29 |
PATH="\${JAVA_HOME}/bin" |
| 30 |
ROOTPATH="\${JAVA_HOME}/bin" |
| 31 |
|
| 32 |
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 |
| 33 |
similarity index 99% |
| 34 |
rename from dev-java/gcj-jdk/gcj-jdk-5.4.0.ebuild |
| 35 |
rename to dev-java/gcj-jdk/gcj-jdk-5.4.0-r1.ebuild |
| 36 |
index 13821c4840e..c56dd496f7c 100644 |
| 37 |
--- a/dev-java/gcj-jdk/gcj-jdk-5.4.0.ebuild |
| 38 |
+++ b/dev-java/gcj-jdk/gcj-jdk-5.4.0-r1.ebuild |
| 39 |
@@ -3,7 +3,7 @@ |
| 40 |
|
| 41 |
EAPI=6 |
| 42 |
|
| 43 |
-inherit java-vm-2 multilib |
| 44 |
+inherit java-vm-2 |
| 45 |
|
| 46 |
DESCRIPTION="Java wrappers around GCJ" |
| 47 |
HOMEPAGE="https://www.gentoo.org/" |
Archives