summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuis Medinas <metalgod@gentoo.org>2005-11-23 23:50:20 +0000
committerLuis Medinas <metalgod@gentoo.org>2005-11-23 23:50:20 +0000
commitb01dad77d6281b403776c1fb626708a8060aee1b (patch)
treea0f1b4c67c1ae22495ae5f9adebd381476158035 /dev-java
parentStable on amd64. (diff)
downloadgentoo-2-b01dad77d6281b403776c1fb626708a8060aee1b.tar.gz
gentoo-2-b01dad77d6281b403776c1fb626708a8060aee1b.tar.bz2
gentoo-2-b01dad77d6281b403776c1fb626708a8060aee1b.zip
Fix package to be able to build with multilib-strict on amd64. Closes bug #113395.
(Portage version: 2.0.53_rc7)
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/swt/ChangeLog6
-rw-r--r--dev-java/swt/swt-3.2_pre1.ebuild6
2 files changed, 8 insertions, 4 deletions
diff --git a/dev-java/swt/ChangeLog b/dev-java/swt/ChangeLog
index 778bcb9b53d1..5c6c1fffae1b 100644
--- a/dev-java/swt/ChangeLog
+++ b/dev-java/swt/ChangeLog
@@ -1,6 +1,10 @@
# 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.29 2005/10/24 16:28:02 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.30 2005/11/23 23:50:20 metalgod Exp $
+
+ 23 Nov 2005; Luis Medinas <metalgod@gentoo.org> swt-3.2_pre1.ebuild:
+ Fix package to be able to build with multilib-strict on amd64. Closes bug
+ #113395.
25 Oct 2005; Saleem Abdulrasool <compnerd@gentoo.org> swt-3.2_pre1.ebuild:
Fixing GTK+ dependency to the lower version which it builds against.
diff --git a/dev-java/swt/swt-3.2_pre1.ebuild b/dev-java/swt/swt-3.2_pre1.ebuild
index 9f8605eb5c0c..4235ab5ea3cf 100644
--- a/dev-java/swt/swt-3.2_pre1.ebuild
+++ b/dev-java/swt/swt-3.2_pre1.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.2_pre1.ebuild,v 1.5 2005/10/24 16:28:02 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.2_pre1.ebuild,v 1.6 2005/11/23 23:50:20 metalgod Exp $
inherit eutils java-pkg
@@ -95,7 +95,7 @@ src_compile() {
fi
# Identity the XTEST library location
- export XTEST_LIB_PATH=/usr/X11R6/lib
+ export XTEST_LIB_PATH=/usr/X11R6/$(get_libdir)
# Fix the pointer size for AMD64
[[ ${ARCH} == 'amd64' ]] && export SWT_PTR_CFLAGS=-DSWT_PTR_SIZE_64
@@ -155,7 +155,7 @@ src_compile() {
src_install() {
java-pkg_dojar swt.jar
- java-pkg_sointo /usr/lib
+ java-pkg_sointo /usr/$(get_libdir)
java-pkg_doso *.so
dohtml about.html