| 1 |
commit: bce5025738d771b4931527f10d7932c7f5ab0f98 |
| 2 |
Author: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org> |
| 3 |
AuthorDate: Tue Nov 6 20:14:07 2018 +0000 |
| 4 |
Commit: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org> |
| 5 |
CommitDate: Thu Jan 3 05:03:34 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=bce50257 |
| 7 |
|
| 8 |
dev-java/cacao: Use relative symlinks as suggested by repoman |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.50, Repoman-2.3.10 |
| 11 |
|
| 12 |
Signed-off-by: Andrew John Hughes <gnu_andrew <AT> member.fsf.org> |
| 13 |
|
| 14 |
dev-java/cacao/ChangeLog | 4 ++++ |
| 15 |
dev-java/cacao/cacao-1.6.0-r4.ebuild | 16 ++++++++-------- |
| 16 |
2 files changed, 12 insertions(+), 8 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-java/cacao/ChangeLog b/dev-java/cacao/ChangeLog |
| 19 |
index 0512ca95..0451cb93 100644 |
| 20 |
--- a/dev-java/cacao/ChangeLog |
| 21 |
+++ b/dev-java/cacao/ChangeLog |
| 22 |
@@ -2,6 +2,10 @@ |
| 23 |
# Copyright 1999-2018 Gentoo Foundation; Distributed under the GPL v2 |
| 24 |
# $Header: /var/cvsroot/gentoo-x86/dev-java/cacao/ChangeLog,v 1.22 2012/06/14 21:25:44 radhermit Exp $ |
| 25 |
|
| 26 |
+ 06 Nov 2018; Andrew John Hughes <gnu_andrew@××××××××××.org> |
| 27 |
+ cacao-1.6.0-r4.ebuild: |
| 28 |
+ dev-java/cacao: Use relative symlinks as suggested by repoman |
| 29 |
+ |
| 30 |
*cacao-1.6.0-r4 (03 Nov 2018) |
| 31 |
|
| 32 |
03 Nov 2018; Andrew John Hughes <gnu_andrew@××××××××××.org> |
| 33 |
|
| 34 |
diff --git a/dev-java/cacao/cacao-1.6.0-r4.ebuild b/dev-java/cacao/cacao-1.6.0-r4.ebuild |
| 35 |
index 1c56a1d1..8b57d2b5 100644 |
| 36 |
--- a/dev-java/cacao/cacao-1.6.0-r4.ebuild |
| 37 |
+++ b/dev-java/cacao/cacao-1.6.0-r4.ebuild |
| 38 |
@@ -61,16 +61,16 @@ src_install() { |
| 39 |
|
| 40 |
emake DESTDIR="${D}" install || die "make install failed" |
| 41 |
dodir /usr/bin |
| 42 |
- dosym /usr/libexec/${PN}/cacao /usr/bin/cacao || die |
| 43 |
+ dosym ../libexec/${PN}/cacao /usr/bin/cacao || die |
| 44 |
dodoc AUTHORS ChangeLog* NEWS README || die "failed to install docs" |
| 45 |
|
| 46 |
dodir ${JDK_DIR}/bin |
| 47 |
- dosym /usr/libexec/${PN}/cacao ${JDK_DIR}/bin/java |
| 48 |
+ dosym ../../../libexec/${PN}/cacao ${JDK_DIR}/bin/java |
| 49 |
|
| 50 |
dodir ${JDK_DIR}/jre/lib |
| 51 |
- dosym /usr/share/classpath/glibj.zip ${JDK_DIR}/jre/lib/rt.jar |
| 52 |
+ dosym ../../../../share/classpath/glibj.zip ${JDK_DIR}/jre/lib/rt.jar |
| 53 |
dodir ${JDK_DIR}/lib |
| 54 |
- dosym /usr/share/classpath/tools.zip ${JDK_DIR}/lib/tools.jar |
| 55 |
+ dosym ../../../share/classpath/tools.zip ${JDK_DIR}/lib/tools.jar |
| 56 |
|
| 57 |
exeinto ${JDK_DIR}/bin |
| 58 |
for files in ${CLASSPATH_DIR}/g*; do |
| 59 |
@@ -97,15 +97,15 @@ src_install() { |
| 60 |
[ ${ARCH} == x86_64 ] && libarch="amd64" |
| 61 |
dodir ${JDK_DIR}/jre/lib/${libarch}/client |
| 62 |
dodir ${JDK_DIR}/jre/lib/${libarch}/server |
| 63 |
- dosym /usr/${libdir}/${PN}/libjvm.so ${JDK_DIR}/jre/lib/${libarch}/client/libjvm.so |
| 64 |
- dosym /usr/${libdir}/${PN}/libjvm.so ${JDK_DIR}/jre/lib/${libarch}/server/libjvm.so |
| 65 |
- dosym /usr/${libdir}/classpath/libjawt.so ${JDK_DIR}/jre/lib/${libarch}/libjawt.so |
| 66 |
+ dosym ../../../../../../${libdir}/${PN}/libjvm.so ${JDK_DIR}/jre/lib/${libarch}/client/libjvm.so |
| 67 |
+ dosym ../../../../../../${libdir}/${PN}/libjvm.so ${JDK_DIR}/jre/lib/${libarch}/server/libjvm.so |
| 68 |
+ dosym ../../../../../${libdir}/classpath/libjawt.so ${JDK_DIR}/jre/lib/${libarch}/libjawt.so |
| 69 |
set_java_env |
| 70 |
|
| 71 |
# Can't use java-vm_set-pax-markings as doesn't work with symbolic links |
| 72 |
# Ensure a PaX header is created. |
| 73 |
local pax_markings="C" |
| 74 |
- # Usally disabeling MPROTECT is sufficent. |
| 75 |
+ # Usually dislabeling MPROTECT is sufficent. |
| 76 |
local pax_markings+="m" |
| 77 |
# On x86 for heap sizes over 700MB disable SEGMEXEC and PAGEEXEC as well. |
| 78 |
use x86 && pax_markings+="sp" |
Archives