[pkgsrc/trunk]: pkgsrc/misc/libreoffice libreoffice: Only enable Java on open...

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/23f133f123bf
branches:  trunk
changeset: 438744:23f133f123bf
user:      nia <nia%pkgsrc.org@localhost>
date:      Wed Sep 09 10:48:25 2020 +0000

description:
libreoffice: Only enable Java on openjdk11 archs

diffstat:

 misc/libreoffice/options.mk |  10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diffs (22 lines):

diff -r bdfa1e847596 -r 23f133f123bf misc/libreoffice/options.mk
--- a/misc/libreoffice/options.mk       Wed Sep 09 10:32:21 2020 +0000
+++ b/misc/libreoffice/options.mk       Wed Sep 09 10:48:25 2020 +0000
@@ -1,10 +1,16 @@
-# $NetBSD: options.mk,v 1.10 2020/08/11 16:07:38 ryoon Exp $
+# $NetBSD: options.mk,v 1.11 2020/09/09 10:48:25 nia Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.libreoffice
 PKG_SUPPORTED_OPTIONS= java debug gtk3 cups
 
 .include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "NetBSD" || ${OPSYS} == "SunOS"
+
+# "checking the installed JDK... configure: error: JDK is too old, you need at least 9"
+#
+# Only enable Java on platforms where OpenJDK>=9 is the default,
+# see mk/java-vm.mk
+.if !empty(MACHINE_PLATFORM:MNetBSD-[789].*-i386) || \
+    !empty(MACHINE_PLATFORM:MNetBSD-[789].*-x86_64)
 PKG_SUGGESTED_OPTIONS+=        java
 .endif