diff options
| author |   Vlastimil Babka <caster@gentoo.org> | 2006-09-19 16:24:23 +0000 |
|---|---|---|
| committer | Vlastimil Babka <caster@gentoo.org> | 2006-09-19 16:24:23 +0000 |
| commit | 0da6077e608c5b927e90e9af5dc99cc152f416b0 (patch) | |
| tree | 55bb5b925b67f0a734e55d88648e436464b3309c | |
| parent | Mark 2.14.2-r1 stable on ia64 (diff) | |
| download | gentoo-2-0da6077e608c5b927e90e9af5dc99cc152f416b0.tar.gz gentoo-2-0da6077e608c5b927e90e9af5dc99cc152f416b0.tar.bz2 gentoo-2-0da6077e608c5b927e90e9af5dc99cc152f416b0.zip | |
Do the javaws symlink only on x86, other archs don't have javaws.
(Portage version: 2.1.2_pre1)
| -rw-r--r-- | dev-java/ibm-jdk-bin/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.6-r4.ebuild | 17 |
2 files changed, 15 insertions, 8 deletions
diff --git a/dev-java/ibm-jdk-bin/ChangeLog b/dev-java/ibm-jdk-bin/ChangeLog index 596ce427868f..f51397c55395 100644 --- a/dev-java/ibm-jdk-bin/ChangeLog +++ b/dev-java/ibm-jdk-bin/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/ibm-jdk-bin # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.81 2006/09/19 16:01:55 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.82 2006/09/19 16:24:23 caster Exp $ + + 19 Sep 2006; Vlastimil Babka <caster@gentoo.org> + ibm-jdk-bin-1.4.2.6-r4.ebuild: + Do the javaws symlink only on x86, other archs don't have javaws. *ibm-jdk-bin-1.4.2.6-r4 (19 Sep 2006) diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.6-r4.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.6-r4.ebuild index f1ee414b25bb..9498503c01ec 100644 --- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.6-r4.ebuild +++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.6-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.6-r4.ebuild,v 1.1 2006/09/19 16:01:55 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.6-r4.ebuild,v 1.2 2006/09/19 16:24:23 caster Exp $ JAVA_SUPPORTS_GENERATION_1="true" inherit java-vm-2 eutils versionator rpm @@ -94,12 +94,15 @@ pkg_nofetch() { src_compile() { true; } src_install() { - # The javaws execution script is 777 why? - chmod 0755 ${S}/jre/javaws/javaws - - # bug #147259 - dosym ../jre/javaws/javaws /opt/${P}/bin/javaws - dosym ../javaws/javaws /opt/${P}/jre/bin/javaws + # javaws is on x86 only + if use x86; then + # The javaws execution script is 777 why? + chmod 0755 ${S}/jre/javaws/javaws + + # bug #147259 + dosym ../jre/javaws/javaws /opt/${P}/bin/javaws + dosym ../javaws/javaws /opt/${P}/jre/bin/javaws + fi # Copy all the files to the designated directory mkdir -p ${D}opt/${P} |