diff options
| author |   Saleem Abdulrasool <compnerd@gentoo.org> | 2005-07-06 03:19:17 +0000 |
|---|---|---|
| committer | Saleem Abdulrasool <compnerd@gentoo.org> | 2005-07-06 03:19:17 +0000 |
| commit | c3ccc10d1e7bb2b40268c2fa4af1340438f7fd89 (patch) | |
| tree | 5d20f6004f8548c668101b47952a06efc005de3e /dev-java | |
| parent | Version bump. Again. (diff) | |
| download | historical-c3ccc10d1e7bb2b40268c2fa4af1340438f7fd89.tar.gz historical-c3ccc10d1e7bb2b40268c2fa4af1340438f7fd89.tar.bz2 historical-c3ccc10d1e7bb2b40268c2fa4af1340438f7fd89.zip | |
backporting IBM JDK fix to _pre7
Package-Manager: portage-2.0.51.22-r1
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/swt/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-java/swt/Manifest | 4 | ||||
| -rw-r--r-- | dev-java/swt/swt-3.1_pre7.ebuild | 14 |
3 files changed, 15 insertions, 8 deletions
diff --git a/dev-java/swt/ChangeLog b/dev-java/swt/ChangeLog index ed0ebfd228bd..3462012453d5 100644 --- a/dev-java/swt/ChangeLog +++ b/dev-java/swt/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-java/swt # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.20 2005/07/06 03:04:23 compnerd Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.21 2005/07/06 03:19:17 compnerd Exp $ + + 05 Jul 2005; Saleem Abdulrasool <compnerd@gentoo.org> swt-3.1_pre7.ebuild: + Backporting IBM JDK fix to _pre7 05 Jul 2005; Saleem Abdulrasool <compnerd@gentoo.org> swt-3.1.ebuild: Fixing $ARCH == 'amd64'; Resolves bug #98025 diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest index 27f32b9d7170..0da7a03919aa 100644 --- a/dev-java/swt/Manifest +++ b/dev-java/swt/Manifest @@ -1,6 +1,6 @@ -MD5 19a0752ddae4465ec127bb1d568990e8 swt-3.1_pre7.ebuild 4614 +MD5 45799272bcbe03f9cf8c9bc8e8a53fb4 swt-3.1_pre7.ebuild 4739 MD5 5e58ddd732765aa23433a53dd039326b swt-3.1_pre5-r1.ebuild 5228 -MD5 8542a5487f057b14b306f6253cad0e38 ChangeLog 3730 +MD5 ef2bafc13ebd43092f673c3c44907785 ChangeLog 3843 MD5 4dcb6dd494f5e369aed5a367e303aef4 metadata.xml 433 MD5 457d7917aba2652a1de2c1f7282b4461 swt-3.1.ebuild 5326 MD5 bd191dfc71013927ffb09f1e464399e8 files/digest-swt-3.1_pre5-r1 147 diff --git a/dev-java/swt/swt-3.1_pre7.ebuild b/dev-java/swt/swt-3.1_pre7.ebuild index 5ac7d9c105d9..c19ba039b171 100644 --- a/dev-java/swt/swt-3.1_pre7.ebuild +++ b/dev-java/swt/swt-3.1_pre7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.1_pre7.ebuild,v 1.2 2005/05/26 18:10:12 compnerd Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.1_pre7.ebuild,v 1.3 2005/07/06 03:19:17 compnerd Exp $ inherit eutils java-pkg @@ -72,12 +72,16 @@ src_compile() { JAVA_HOME=$(java-config -O) # Identify the AWT path - if [[ ${ARCH} == 'x86' ]] ; then - export AWT_LIB_PATH=$JAVA_HOME/jre/lib/i386 - elif [[ ${ARCH} == 'ppc' ]] ; then + if [[ ! -z "$(java-config --java-version | grep 'IBM')" ]] ; then export AWT_LIB_PATH=$JAVA_HOME/jre/bin else - export AWT_LIB_PATH=$JAVA_HOME/jre/lib/amd64 + if [[ ${ARCH} == 'x86' ]] ; then + export AWT_LIB_PATH=$JAVA_HOME/jre/lib/i386 + elif [[ ${ARCH} == 'ppc' ]] ; then + export AWT_LIB_PATH=$JAVA_HOME/jre/bin + else + export AWT_LIB_PATH=$JAVA_HOME/jre/lib/amd64 + fi fi # Identity the XTEST library location |