Tue Feb 2 01:18:24 2021 UTC ()
java-jna: use ANT_ARGS consistently (follow-on build fix)

Fix my previous fix: apparently I misread something that was right in
front of me, whoops.


(gutteridge)
diff -r1.7 -r1.8 pkgsrc/devel/java-jna/Makefile
cvs diff -r1.7 -r1.8 pkgsrc/devel/java-jna/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/java-jna/Makefile 2021/01/23 01:18:48 1.7
+++ pkgsrc/devel/java-jna/Makefile 2021/02/02 01:18:24 1.8
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.7 2021/01/23 01:18:48 gutteridge Exp $ 1# $NetBSD: Makefile,v 1.8 2021/02/02 01:18:24 gutteridge Exp $
2 2
3DISTNAME= jna-5.2.0 3DISTNAME= jna-5.2.0
4PKGNAME= java-${DISTNAME} 4PKGNAME= java-${DISTNAME}
5PKGREVISION= 2 5PKGREVISION= 2
6CATEGORIES= devel java 6CATEGORIES= devel java
7MASTER_SITES= ${MASTER_SITE_GITHUB:=java-native-access/} 7MASTER_SITES= ${MASTER_SITE_GITHUB:=java-native-access/}
8GITHUB_PROJECT= jna 8GITHUB_PROJECT= jna
9 9
10MAINTAINER= nonakap@gmail.com 10MAINTAINER= nonakap@gmail.com
11HOMEPAGE= https://github.com/java-native-access/jna 11HOMEPAGE= https://github.com/java-native-access/jna
12COMMENT= JNA provides Java programs easy access to native shared libraries. 12COMMENT= JNA provides Java programs easy access to native shared libraries.
13LICENSE= gnu-lgpl-v2.1 OR apache-2.0 13LICENSE= gnu-lgpl-v2.1 OR apache-2.0
14 14
@@ -66,39 +66,40 @@ PLIST_SRC+= PLIST.java8-javadoc @@ -66,39 +66,40 @@ PLIST_SRC+= PLIST.java8-javadoc
66.else 66.else
67PLIST_SRC+= PLIST.java11-javadoc 67PLIST_SRC+= PLIST.java11-javadoc
68.endif 68.endif
69 69
70BUILD_DEPENDS+= apache-ant-[0-9]*:../../devel/apache-ant 70BUILD_DEPENDS+= apache-ant-[0-9]*:../../devel/apache-ant
71 71
72INSTALLATION_DIRS+= \ 72INSTALLATION_DIRS+= \
73 lib/java/jna share/doc/${PKGBASE} 73 lib/java/jna share/doc/${PKGBASE}
74 74
75ANT_ARGS+= -Ddynlink.native=true 75ANT_ARGS+= -Ddynlink.native=true
76ANT_ARGS+= -Dbuild-native=true 76ANT_ARGS+= -Dbuild-native=true
77ANT_ARGS+= -Dcflags_extra.native="" 77ANT_ARGS+= -Dcflags_extra.native=""
78ANT_ARGS+= -DCC=${CC} 78ANT_ARGS+= -DCC=${CC}
 79ANT_ARGS+= -Dgrep=grep
 80ANT_ARGS+= -Dmake=make
 81ANT_ARGS+= -Dmake.PATH=PATH=${PATH:Q}
79ANT_TARGET= jar contrib-jars javadoc 82ANT_TARGET= jar contrib-jars javadoc
80 83
81# Needed with recent GCC versions, e.g., 9.3. 84# Needed with recent GCC versions, e.g., 9.3.
82BUILDLINK_TRANSFORM+= rm:-Werror 85BUILDLINK_TRANSFORM+= rm:-Werror
83.if empty(PKGSRC_COMPILER:Mclang) 86.if empty(PKGSRC_COMPILER:Mclang)
84BUILDLINK_TRANSFORM+= rm:-Wno-unknown-warning-option 87BUILDLINK_TRANSFORM+= rm:-Wno-unknown-warning-option
85.endif 88.endif
86 89
87do-build: 90do-build:
88 cd ${WRKSRC} && \ 91 cd ${WRKSRC} && \
89 ${_ULIMIT_CMD}${SETENV} ${MAKE_ENV} \ 92 ${_ULIMIT_CMD}${SETENV} ${MAKE_ENV} ${PREFIX}/bin/ant ${ANT_ARGS} ${ANT_TARGET}
90 -Dgrep=grep -Dmake=make -Dmake.PATH=PATH=${PATH:Q} \ 
91 ${PREFIX}/bin/ant ${ANT_ARGS} ${ANT_TARGET} 
92 93
93do-install: 94do-install:
94 ${INSTALL_LIB} ${WRKSRC}/build/native-*/${JNIPFX}jnidispatch.${JNISFX} \ 95 ${INSTALL_LIB} ${WRKSRC}/build/native-*/${JNIPFX}jnidispatch.${JNISFX} \
95 ${DESTDIR}${PREFIX}/lib 96 ${DESTDIR}${PREFIX}/lib
96 ${INSTALL_DATA} ${WRKSRC}/build/jna-native.jar \ 97 ${INSTALL_DATA} ${WRKSRC}/build/jna-native.jar \
97 ${DESTDIR}${PREFIX}/lib/java/jna/jna-native.jar 98 ${DESTDIR}${PREFIX}/lib/java/jna/jna-native.jar
98 ${INSTALL_DATA} ${WRKSRC}/build/jna.jar \ 99 ${INSTALL_DATA} ${WRKSRC}/build/jna.jar \
99 ${DESTDIR}${PREFIX}/lib/java/jna/jna.jar 100 ${DESTDIR}${PREFIX}/lib/java/jna/jna.jar
100 ${INSTALL_DATA} ${WRKSRC}/contrib/platform/dist/jna-platform.jar \ 101 ${INSTALL_DATA} ${WRKSRC}/contrib/platform/dist/jna-platform.jar \
101 ${DESTDIR}${PREFIX}/lib/java/jna/jna-platform.jar 102 ${DESTDIR}${PREFIX}/lib/java/jna/jna-platform.jar
102 for i in AL2.0 LGPL2.1 LICENSE LICENSE.AL LICENSE.LGPL \ 103 for i in AL2.0 LGPL2.1 LICENSE LICENSE.AL LICENSE.LGPL \
103 CHANGES.md OTHERS README.md TODO; \ 104 CHANGES.md OTHERS README.md TODO; \
104 do \ 105 do \