pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk Prefer openjdk11 to adoptopenjdk11-bin for NetBSD



details:   https://anonhg.NetBSD.org/pkgsrc/rev/b777c952ead6
branches:  trunk
changeset: 443518:b777c952ead6
user:      abs <abs%pkgsrc.org@localhost>
date:      Mon Dec 14 16:51:16 2020 +0000

description:
Prefer openjdk11 to adoptopenjdk11-bin for NetBSD

(In the _PKG_JVMS.9 case)

diffstat:

 mk/java-vm.mk |  7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diffs (22 lines):

diff -r 014770bca5df -r b777c952ead6 mk/java-vm.mk
--- a/mk/java-vm.mk     Mon Dec 14 16:50:31 2020 +0000
+++ b/mk/java-vm.mk     Mon Dec 14 16:51:16 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: java-vm.mk,v 1.121 2020/07/29 21:42:30 rjs Exp $
+# $NetBSD: java-vm.mk,v 1.122 2020/12/14 16:51:16 abs Exp $
 #
 # This Makefile fragment handles Java dependencies and make variables,
 # and is meant to be included by packages that require Java either at
@@ -73,7 +73,12 @@
 
 # This is a list of all of the JDKs that may be used.
 #
+# adoptopenjdk11-bin and openjdk-bin do not provide native NetBSD binaries
+.if ${OPSYS} == "NetBSD"
+_PKG_JVMS.9=           openjdk11 adoptopenjdk11-bin openjdk-bin
+.else
 _PKG_JVMS.9=           adoptopenjdk11-bin openjdk-bin openjdk11
+.endif
 _PKG_JVMS.8=           ${_PKG_JVMS.9} openjdk8 oracle-jdk8
 _PKG_JVMS.7=           ${_PKG_JVMS.8} sun-jdk7
 _PKG_JVMS.6=           ${_PKG_JVMS.7} jdk16



Home | Main Index | Thread Index | Old Index