summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2010-07-02 20:41:39 +0000
committerjoerg <joerg@pkgsrc.org>2010-07-02 20:41:39 +0000
commitad77e83f2f648e8bc50f0297d2689755b25fa15c (patch)
tree0aee9286a8494499435946d2c4fae5927bfd2970
parentb7cd7e3de7a25afdf1ef51b51e4f1f3f00a1b94d (diff)
downloadpkgsrc-ad77e83f2f648e8bc50f0297d2689755b25fa15c.tar.gz
Try harder to actually find -ljawt.
-rw-r--r--devel/swt/Makefile10
-rw-r--r--devel/swt/files/make_pkgsrc.mak4
2 files changed, 11 insertions, 3 deletions
diff --git a/devel/swt/Makefile b/devel/swt/Makefile
index cf7d21735ce..9de5c7685b7 100644
--- a/devel/swt/Makefile
+++ b/devel/swt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2010/06/13 22:44:10 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2010/07/02 20:41:39 joerg Exp $
#
SWTREL= 3.5.1
@@ -35,6 +35,13 @@ PLIST_SUBST+= SWTVER=${SWTVER}
INSTALLATION_DIRS+= share/java
INSTALLATION_DIRS+= lib/jni
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "NetBSD" && ${LOWER_ARCH} == "x86_64"
+MY_LOWER_ARCH= amd64
+.endif
+MY_LOWER_ARCH?= ${LOWER_ARCH}
+
post-extract:
cd ${WRKSRC} && jar -xf ${WRKSRC}/src.zip
cp ${FILESDIR}/make_pkgsrc.mak ${WRKSRC}
@@ -44,6 +51,7 @@ do-build:
cd ${WRKSRC} && ${GMAKE} \
JAVA_HOME=${PKG_JAVA_HOME} \
LOWER_OPSYS=${LOWER_OPSYS} \
+ LOWER_ARCH=${MY_LOWER_ARCH} \
-f make_pkgsrc.mak ${target}
.endfor
${TEST} -d ${WRKSRC}/bin || mkdir ${WRKSRC}/bin
diff --git a/devel/swt/files/make_pkgsrc.mak b/devel/swt/files/make_pkgsrc.mak
index 3334660b226..07e2ec746f3 100644
--- a/devel/swt/files/make_pkgsrc.mak
+++ b/devel/swt/files/make_pkgsrc.mak
@@ -1,4 +1,4 @@
-# $NetBSD: make_pkgsrc.mak,v 1.1.1.1 2010/02/03 13:51:29 jmcneill Exp $
+# $NetBSD: make_pkgsrc.mak,v 1.2 2010/07/02 20:41:39 joerg Exp $
#*******************************************************************************
# Copyright (c) 2000, 2009 IBM Corporation and others.
# All rights reserved. This program and the accompanying materials
@@ -51,7 +51,7 @@ GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0` `pkg-config --libs-onl
CDE_LIBS = -L$(CDE_HOME)/lib -R$(CDE_HOME)/lib -lXt -lX11 -lDtSvc
-AWT_LIBS = -L$(AWT_LIB_PATH) -ljawt -shared
+AWT_LIBS = -L$(JAVA_HOME)/jre/lib/$(LOWER_ARCH) -R$(JAVA_HOME)/jre/lib/$(LOWER_ARCH) -ljawt -shared
ATKCFLAGS = `pkg-config --cflags atk gtk+-2.0`
ATKLIBS = `pkg-config --libs-only-L atk gtk+-2.0` `pkg-config --libs-only-other atk gtk+-2.0` -latk-1.0 -lgtk-x11-2.0