diff options
author | tron <tron> | 2015-04-27 21:47:25 +0000 |
---|---|---|
committer | tron <tron> | 2015-04-27 21:47:25 +0000 |
commit | b4828d5b502dde611afceefe7cb22299404d346f (patch) | |
tree | fb6488243f6d690e0252aef8d7eaf4544961a27a | |
parent | 6e53316d2720c8df15f445d8d46dafd6edd58b7c (diff) | |
download | pkgsrc-b4828d5b502dde611afceefe7cb22299404d346f.tar.gz |
Pullup ticket #4687 - requested by joerg
comms/java-rxtx: build fix
Revisions pulled up:
- comms/java-rxtx/Makefile 1.5
---
Module Name: pkgsrc
Committed By: joerg
Date: Fri Apr 24 20:16:54 UTC 2015
Modified Files:
pkgsrc/comms/java-rxtx: Makefile
Log Message:
Uses libtool, so replace with our version. Use the correct machine
directory on NetBSD/ARM.
-rw-r--r-- | comms/java-rxtx/Makefile | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/comms/java-rxtx/Makefile b/comms/java-rxtx/Makefile index 4a5d3a455cb..4a3a8facd64 100644 --- a/comms/java-rxtx/Makefile +++ b/comms/java-rxtx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2013/03/29 12:40:24 dsainty Exp $ +# $NetBSD: Makefile,v 1.4.18.1 2015/04/27 21:47:25 tron Exp $ # DISTNAME= rxtx-2.1-7r2 @@ -14,6 +14,7 @@ COMMENT= Java serial IO library LICENSE= gnu-lgpl-v2 # or later USE_TOOLS+= aclocal autoconf autoheader automake gmake unzip +USE_LIBTOOL= yes USE_LANGUAGES= c c++ GNU_CONFIGURE= yes MAKE_JOBS_SAFE= no @@ -26,7 +27,15 @@ PKG_JVMS_ACCEPTED= openjdk7 sun-jdk7 sun-jdk6 sun-jdk15 sun-jdk14 MAKE_ENV+= JAVA_HOME=${PKG_JAVA_HOME} -JAVA_MACHINE_ARCH= ${MACHINE_ARCH:S/x86_64/amd64/} +.include "../../mk/bsd.prefs.mk" + +.if ${MACHINE_ARCH} == "x86_64" +JAVA_MACHINE_ARCH= amd64 +.elif ${OPSYS} == "NetBSD" && ${MACHINE_CPU:U} == "arm" +JAVA_MACHINE_ARCH= arm +.else +JAVA_MACHINE_ARCH= ${MACHINE_ARCH} +.endif INSTALLATION_DIRS+= ${PKG_JAVA_HOME}/jre/lib/ext INSTALLATION_DIRS+= ${PKG_JAVA_HOME}/jre/lib/${JAVA_MACHINE_ARCH} |