| 1 |
caster 07/12/16 10:36:42 |
| 2 |
|
| 3 |
Modified: ChangeLog swt-3.3.ebuild |
| 4 |
Removed: swt-3.3_rc4.ebuild |
| 5 |
Log: |
| 6 |
Rewrite of the code that determines AWT_LIB_PATH, based on upstream's build.sh. The old way broke with the new ibm-jdk-bin-1.6. Remove rc4. |
| 7 |
|
| 8 |
(Portage version: 2.1.4_rc9) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.73 dev-java/swt/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/swt/ChangeLog?rev=1.73&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/swt/ChangeLog?rev=1.73&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/swt/ChangeLog?r1=1.72&r2=1.73 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v |
| 20 |
retrieving revision 1.72 |
| 21 |
retrieving revision 1.73 |
| 22 |
diff -u -r1.72 -r1.73 |
| 23 |
--- ChangeLog 20 Aug 2007 17:58:51 -0000 1.72 |
| 24 |
+++ ChangeLog 16 Dec 2007 10:36:41 -0000 1.73 |
| 25 |
@@ -1,6 +1,11 @@ |
| 26 |
# ChangeLog for dev-java/swt |
| 27 |
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.72 2007/08/20 17:58:51 caster Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.73 2007/12/16 10:36:41 caster Exp $ |
| 30 |
+ |
| 31 |
+ 16 Dec 2007; Vlastimil Babka <caster@g.o> -swt-3.3_rc4.ebuild, |
| 32 |
+ swt-3.3.ebuild: |
| 33 |
+ Rewrite of the code that determines AWT_LIB_PATH, based on upstream's |
| 34 |
+ build.sh. The old way broke with the new ibm-jdk-bin-1.6. Remove rc4. |
| 35 |
|
| 36 |
*swt-3.3 (20 Aug 2007) |
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
|
| 41 |
1.3 dev-java/swt/swt-3.3.ebuild |
| 42 |
|
| 43 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/swt/swt-3.3.ebuild?rev=1.3&view=markup |
| 44 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/swt/swt-3.3.ebuild?rev=1.3&content-type=text/plain |
| 45 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/swt/swt-3.3.ebuild?r1=1.2&r2=1.3 |
| 46 |
|
| 47 |
Index: swt-3.3.ebuild |
| 48 |
=================================================================== |
| 49 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.3.ebuild,v |
| 50 |
retrieving revision 1.2 |
| 51 |
retrieving revision 1.3 |
| 52 |
diff -u -r1.2 -r1.3 |
| 53 |
--- swt-3.3.ebuild 22 Aug 2007 16:46:07 -0000 1.2 |
| 54 |
+++ swt-3.3.ebuild 16 Dec 2007 10:36:41 -0000 1.3 |
| 55 |
@@ -1,6 +1,6 @@ |
| 56 |
# Copyright 1999-2007 Gentoo Foundation |
| 57 |
# Distributed under the terms of the GNU General Public License v2 |
| 58 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.3.ebuild,v 1.2 2007/08/22 16:46:07 mr_bones_ Exp $ |
| 59 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.3.ebuild,v 1.3 2007/12/16 10:36:41 caster Exp $ |
| 60 |
|
| 61 |
inherit eutils java-pkg-2 java-ant-2 toolchain-funcs |
| 62 |
|
| 63 |
@@ -87,8 +87,8 @@ |
| 64 |
rm -rf about_files/ || die |
| 65 |
|
| 66 |
# Replace the build.xml to allow compilation without Eclipse tasks |
| 67 |
- cp "${FILESDIR}"/build.xml ${S}/build.xml || die "Unable to update build.xml" |
| 68 |
- mkdir ${S}/src && mv ${S}/org ${S}/src || die "Unable to restructure SWT sources" |
| 69 |
+ cp "${FILESDIR}"/build.xml "${S}/build.xml" || die "Unable to update build.xml" |
| 70 |
+ mkdir "${S}/src" && mv "${S}/org" "${S}/src" || die "Unable to restructure SWT sources" |
| 71 |
|
| 72 |
# apply all the patches, including arch-specific |
| 73 |
# EPATCH_SOURCE="${WORKDIR}/${PATCHSET}" EPATCH_SUFFIX="patch" epatch |
| 74 |
@@ -123,18 +123,24 @@ |
| 75 |
# Identify the AWT path |
| 76 |
# The IBM VMs and the GNU GCC implementations do not store the AWT libraries |
| 77 |
# in the same location as the rest of the binary VMs. |
| 78 |
- if [[ ! -z "$(java-config --java-version | grep 'IBM')" ]] ; then |
| 79 |
- export AWT_LIB_PATH=$JAVA_HOME/jre/bin |
| 80 |
- elif [[ ! -z "$(java-config --java-version | grep 'GNU libgcj')" ]] ; then |
| 81 |
- export AWT_LIB_PATH=$JAVA_HOME/$(get_libdir) |
| 82 |
+ local AWT_ARCH |
| 83 |
+ local JAWTSO="libjawt.so" |
| 84 |
+ if [[ $(tc-arch) == 'x86' ]] ; then |
| 85 |
+ AWT_ARCH="i386" |
| 86 |
+ elif [[ $(tc-arch) == 'ppc' ]] ; then |
| 87 |
+ AWT_ARCH="ppc" |
| 88 |
else |
| 89 |
- if [[ $(tc-arch) == 'x86' ]] ; then |
| 90 |
- export AWT_LIB_PATH=$JAVA_HOME/jre/lib/i386 |
| 91 |
- elif [[ $(tc-arch) == 'ppc' ]] ; then |
| 92 |
- export AWT_LIB_PATH=$JAVA_HOME/jre/lib/ppc |
| 93 |
- else |
| 94 |
- export AWT_LIB_PATH=$JAVA_HOME/jre/lib/amd64 |
| 95 |
- fi |
| 96 |
+ AWT_ARCH="amd64" |
| 97 |
+ fi |
| 98 |
+ if [[ -f "${JAVA_HOME}/jre/lib/${AWT_ARCH}/${JAWTSO}" ]]; then |
| 99 |
+ export AWT_LIB_PATH="${JAVA_HOME}/jre/lib/${AWT_ARCH}" |
| 100 |
+ elif [[ -f "${JAVA_HOME}/jre/bin/${JAWTSO}" ]]; then |
| 101 |
+ export AWT_LIB_PATH="${JAVA_HOME}/jre/bin" |
| 102 |
+ elif [[ -f "${JAVA_HOME}/$(get_libdir)/${JAWTSO}" ]] ; then |
| 103 |
+ export AWT_LIB_PATH="${JAVA_HOME}/$(get_libdir)" |
| 104 |
+ else |
| 105 |
+ eerror "${JAWTSO} not found in the JDK being used for compilation!" |
| 106 |
+ die "cannot build AWT library" |
| 107 |
fi |
| 108 |
|
| 109 |
# Fix the pointer size for AMD64 |
| 110 |
|
| 111 |
|
| 112 |
|
| 113 |
-- |
| 114 |
gentoo-commits@g.o mailing list |
Archives