pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/java-jna java-jna: non-NetBSD build fixes
details: https://anonhg.NetBSD.org/pkgsrc/rev/00fe05efcf9f
branches: trunk
changeset: 445411:00fe05efcf9f
user: gutteridge <gutteridge%pkgsrc.org@localhost>
date: Sat Jan 23 01:18:48 2021 +0000
description:
java-jna: non-NetBSD build fixes
This package expects GNU grep, and also makes assumptions about tool
paths that don't always hold (mostly relating to SunOS derivates).
Force use of pkgsrc-supplied tools.
diffstat:
devel/java-jna/Makefile | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diffs (38 lines):
diff -r c8bfe56240f6 -r 00fe05efcf9f devel/java-jna/Makefile
--- a/devel/java-jna/Makefile Fri Jan 22 20:08:32 2021 +0000
+++ b/devel/java-jna/Makefile Sat Jan 23 01:18:48 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2021/01/22 01:22:46 gutteridge Exp $
+# $NetBSD: Makefile,v 1.7 2021/01/23 01:18:48 gutteridge Exp $
DISTNAME= jna-5.2.0
PKGNAME= java-${DISTNAME}
@@ -40,7 +40,7 @@
USE_LANGUAGES= c
USE_JAVA= yes
USE_JAVA2= yes
-USE_TOOLS+= autoreconf automake autoconf gmake pkg-config pax
+USE_TOOLS+= autoreconf automake autoconf ggrep gmake pkg-config pax
USE_LIBTOOL= yes
OPSYSVARS+= JNIPFX JNISFX
@@ -62,7 +62,7 @@
# JDK 11 or later doesn't generate frames
PLIST_SRC= PLIST
.if ${PKG_JVM} == "sun-jdk7" || ${PKG_JVM} == "oracle-jdk8" || ${PKG_JVM} == "openjdk8"
-PLIST_SRC+= PLIST.java8-javadoc
+PLIST_SRC+= PLIST.java8-javadoc
.else
PLIST_SRC+= PLIST.java11-javadoc
.endif
@@ -86,7 +86,9 @@
do-build:
cd ${WRKSRC} && \
- ${_ULIMIT_CMD}${SETENV} ${MAKE_ENV} ${PREFIX}/bin/ant ${ANT_ARGS} ${ANT_TARGET}
+ ${_ULIMIT_CMD}${SETENV} ${MAKE_ENV} \
+ -Dgrep=grep -Dmake=make -Dmake.PATH=PATH=${PATH:Q} \
+ ${PREFIX}/bin/ant ${ANT_ARGS} ${ANT_TARGET}
do-install:
${INSTALL_LIB} ${WRKSRC}/build/native-*/${JNIPFX}jnidispatch.${JNISFX} \
Home |
Main Index |
Thread Index |
Old Index