diff options
| author |   Serkan Kaba <serkan@gentoo.org> | 2009-04-22 21:37:47 +0000 |
|---|---|---|
| committer | Serkan Kaba <serkan@gentoo.org> | 2009-04-22 21:37:47 +0000 |
| commit | e5aead662492ed65c582f86972be4cfd3a6bf801 (patch) | |
| tree | 5795832c6408d6b1ace61ccffda58f7706452899 /dev-java/ibm-jdk-bin | |
| parent | amd64 stable, bug #265702 (diff) | |
| download | gentoo-2-e5aead662492ed65c582f86972be4cfd3a6bf801.tar.gz gentoo-2-e5aead662492ed65c582f86972be4cfd3a6bf801.tar.bz2 gentoo-2-e5aead662492ed65c582f86972be4cfd3a6bf801.zip | |
Fixed vm.jar path bug for ppc64 as well. Reported by Brent Baude <ranger@gentoo.org>
(Portage version: 2.2_rc31/cvs/Linux x86_64)
Diffstat (limited to 'dev-java/ibm-jdk-bin')
| -rw-r--r-- | dev-java/ibm-jdk-bin/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.4.ebuild | 20 |
2 files changed, 17 insertions, 9 deletions
diff --git a/dev-java/ibm-jdk-bin/ChangeLog b/dev-java/ibm-jdk-bin/ChangeLog index adb187a71959..417172ceb65e 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-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.199 2009/04/22 14:27:31 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.200 2009/04/22 21:37:47 serkan Exp $ + + 22 Apr 2009; Serkan Kaba <serkan@gentoo.org> ibm-jdk-bin-1.6.0.4: + Fixed vm.jar path bug for ppc64 as well. Reported by Brent Baude + <ranger@gentoo.org> 22 Apr 2009; Brent Baude <ranger@gentoo.org> ibm-jdk-bin-1.5.0.9-r1.ebuild: diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.4.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.4.ebuild index 85cdbdd45eb6..08d185b37bda 100644 --- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.4.ebuild +++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 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.6.0.4.ebuild,v 1.2 2009/03/30 15:56:44 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.4.ebuild,v 1.3 2009/04/22 21:37:47 serkan Exp $ inherit java-vm-2 versionator eutils @@ -226,13 +226,6 @@ src_install() { fi fi - if use amd64; then - # a workaround to fix the BOOTCLASSPATH in our env file - # this is not optimal, using -Xcompressedrefs would probably make it - # expect the compressedrefs version... - dosym /opt/${P}/jre/lib/amd64/default/jclSC160/vm.jar /opt/${P}/jre/lib/ - fi - local desktop_in="${D}/opt/${P}/jre/plugin/desktop/sun_java.desktop" if [[ -f "${desktop_in}" ]]; then local desktop_out="${T}/ibm_jdk-${SLOT}.desktop" @@ -252,5 +245,16 @@ src_install() { dodoc "${S}"/{copyright,notices.txt,readmefirst.lnx.txt} || die set_java_env + + # a workaround to fix the BOOTCLASSPATH in our env file + # this is not optimal, using -Xcompressedrefs would probably make it + # expect the compressedrefs version... + if use amd64; then + sed -i -e "s|vm.jar|amd64/default/jclSC160/vm.jar|g" "${D}${JAVA_VM_CONFIG_DIR}/${VMHANDLE}" || die "sed failed" + fi + if use ppc64; then + sed -i -e "s|vm.jar|ppc64/default/jclSC160/vm.jar|g" "${D}${JAVA_VM_CONFIG_DIR}/${VMHANDLE}" || die "sed failed" + fi + java-vm_revdep-mask } |