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: fix builds with openjdk11 and...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/af9d0c749e0c
branches:  trunk
changeset: 445377:af9d0c749e0c
user:      gutteridge <gutteridge%pkgsrc.org@localhost>
date:      Fri Jan 22 01:22:46 2021 +0000

description:
java-jna: fix builds with openjdk11 and recent GCC versions

The most recent openjdk11 update resulted in a change to the jquery
version that affects PLIST population of this package. Separately, there
are upstream compiler flags that were causing compilation failures with
recent GCC versions, e.g., 9.3 on NetBSD 9.99.78. (Since different Java
11 packages in pkgsrc aren't aligned with each other release-wise, this
may cause breakage elsewhere, but this at least fixes recent NetBSD on
x86. There's an unrelated problem with this package building on SmartOS
which I'll deal with separately.)

diffstat:

 devel/java-jna/Makefile             |  10 ++++++++--
 devel/java-jna/PLIST.java11-javadoc |   5 ++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diffs (46 lines):

diff -r 95061084ebc6 -r af9d0c749e0c devel/java-jna/Makefile
--- a/devel/java-jna/Makefile   Thu Jan 21 20:20:06 2021 +0000
+++ b/devel/java-jna/Makefile   Fri Jan 22 01:22:46 2021 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2020/06/26 10:26:08 yyamano Exp $
+# $NetBSD: Makefile,v 1.6 2021/01/22 01:22:46 gutteridge Exp $
 
 DISTNAME=      jna-5.2.0
 PKGNAME=       java-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel java
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=java-native-access/}
 GITHUB_PROJECT=        jna
@@ -78,6 +78,12 @@
 ANT_ARGS+=     -DCC=${CC}
 ANT_TARGET=    jar contrib-jars javadoc
 
+# Needed with recent GCC versions, e.g., 9.3.
+BUILDLINK_TRANSFORM+=  rm:-Werror
+.if empty(PKGSRC_COMPILER:Mclang)
+BUILDLINK_TRANSFORM+=  rm:-Wno-unknown-warning-option
+.endif
+
 do-build:
        cd ${WRKSRC} && \
            ${_ULIMIT_CMD}${SETENV} ${MAKE_ENV} ${PREFIX}/bin/ant ${ANT_ARGS} ${ANT_TARGET}
diff -r 95061084ebc6 -r af9d0c749e0c devel/java-jna/PLIST.java11-javadoc
--- a/devel/java-jna/PLIST.java11-javadoc       Thu Jan 21 20:20:06 2021 +0000
+++ b/devel/java-jna/PLIST.java11-javadoc       Fri Jan 22 01:22:46 2021 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.java11-javadoc,v 1.1 2020/06/26 10:26:08 yyamano Exp $
+@comment $NetBSD: PLIST.java11-javadoc,v 1.2 2021/01/22 01:22:46 gutteridge Exp $
 share/doc/java-jna/doc/javadoc/allclasses-index.html
 share/doc/java-jna/doc/javadoc/allclasses.html
 share/doc/java-jna/doc/javadoc/allpackages-index.html
@@ -1184,8 +1184,7 @@
 share/doc/java-jna/doc/javadoc/jquery/images/ui-icons_454545_256x240.png
 share/doc/java-jna/doc/javadoc/jquery/images/ui-icons_888888_256x240.png
 share/doc/java-jna/doc/javadoc/jquery/images/ui-icons_cd0a0a_256x240.png
-share/doc/java-jna/doc/javadoc/jquery/jquery-3.3.1.js
-share/doc/java-jna/doc/javadoc/jquery/jquery-migrate-3.0.1.js
+share/doc/java-jna/doc/javadoc/jquery/jquery-3.5.1.js
 share/doc/java-jna/doc/javadoc/jquery/jquery-ui.css
 share/doc/java-jna/doc/javadoc/jquery/jquery-ui.js
 share/doc/java-jna/doc/javadoc/jquery/jquery-ui.min.css



Home | Main Index | Thread Index | Old Index