| 1 |
serkan 09/04/22 21:37:48 |
| 2 |
|
| 3 |
Modified: ChangeLog ibm-jdk-bin-1.6.0.4.ebuild |
| 4 |
Log: |
| 5 |
Fixed vm.jar path bug for ppc64 as well. Reported by Brent Baude <ranger@g.o> |
| 6 |
(Portage version: 2.2_rc31/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.200 dev-java/ibm-jdk-bin/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog?rev=1.200&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog?rev=1.200&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog?r1=1.199&r2=1.200 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v |
| 18 |
retrieving revision 1.199 |
| 19 |
retrieving revision 1.200 |
| 20 |
diff -u -r1.199 -r1.200 |
| 21 |
--- ChangeLog 22 Apr 2009 14:27:31 -0000 1.199 |
| 22 |
+++ ChangeLog 22 Apr 2009 21:37:47 -0000 1.200 |
| 23 |
@@ -1,6 +1,10 @@ |
| 24 |
# ChangeLog for dev-java/ibm-jdk-bin |
| 25 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.199 2009/04/22 14:27:31 ranger Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.200 2009/04/22 21:37:47 serkan Exp $ |
| 28 |
+ |
| 29 |
+ 22 Apr 2009; Serkan Kaba <serkan@g.o> ibm-jdk-bin-1.6.0.4: |
| 30 |
+ Fixed vm.jar path bug for ppc64 as well. Reported by Brent Baude |
| 31 |
+ <ranger@g.o> |
| 32 |
|
| 33 |
22 Apr 2009; Brent Baude <ranger@g.o> |
| 34 |
ibm-jdk-bin-1.5.0.9-r1.ebuild: |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.3 dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.4.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.4.ebuild?rev=1.3&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.4.ebuild?rev=1.3&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.4.ebuild?r1=1.2&r2=1.3 |
| 43 |
|
| 44 |
Index: ibm-jdk-bin-1.6.0.4.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.4.ebuild,v |
| 47 |
retrieving revision 1.2 |
| 48 |
retrieving revision 1.3 |
| 49 |
diff -u -r1.2 -r1.3 |
| 50 |
--- ibm-jdk-bin-1.6.0.4.ebuild 30 Mar 2009 15:56:44 -0000 1.2 |
| 51 |
+++ ibm-jdk-bin-1.6.0.4.ebuild 22 Apr 2009 21:37:47 -0000 1.3 |
| 52 |
@@ -1,6 +1,6 @@ |
| 53 |
# Copyright 1999-2009 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $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 $ |
| 56 |
+# $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 $ |
| 57 |
|
| 58 |
inherit java-vm-2 versionator eutils |
| 59 |
|
| 60 |
@@ -226,13 +226,6 @@ |
| 61 |
fi |
| 62 |
fi |
| 63 |
|
| 64 |
- if use amd64; then |
| 65 |
- # a workaround to fix the BOOTCLASSPATH in our env file |
| 66 |
- # this is not optimal, using -Xcompressedrefs would probably make it |
| 67 |
- # expect the compressedrefs version... |
| 68 |
- dosym /opt/${P}/jre/lib/amd64/default/jclSC160/vm.jar /opt/${P}/jre/lib/ |
| 69 |
- fi |
| 70 |
- |
| 71 |
local desktop_in="${D}/opt/${P}/jre/plugin/desktop/sun_java.desktop" |
| 72 |
if [[ -f "${desktop_in}" ]]; then |
| 73 |
local desktop_out="${T}/ibm_jdk-${SLOT}.desktop" |
| 74 |
@@ -252,5 +245,16 @@ |
| 75 |
dodoc "${S}"/{copyright,notices.txt,readmefirst.lnx.txt} || die |
| 76 |
|
| 77 |
set_java_env |
| 78 |
+ |
| 79 |
+ # a workaround to fix the BOOTCLASSPATH in our env file |
| 80 |
+ # this is not optimal, using -Xcompressedrefs would probably make it |
| 81 |
+ # expect the compressedrefs version... |
| 82 |
+ if use amd64; then |
| 83 |
+ sed -i -e "s|vm.jar|amd64/default/jclSC160/vm.jar|g" "${D}${JAVA_VM_CONFIG_DIR}/${VMHANDLE}" || die "sed failed" |
| 84 |
+ fi |
| 85 |
+ if use ppc64; then |
| 86 |
+ sed -i -e "s|vm.jar|ppc64/default/jclSC160/vm.jar|g" "${D}${JAVA_VM_CONFIG_DIR}/${VMHANDLE}" || die "sed failed" |
| 87 |
+ fi |
| 88 |
+ |
| 89 |
java-vm_revdep-mask |
| 90 |
} |
Archives