Mon Oct 26 12:44:21 2020 UTC ()
Ensure USE_JAVA2 is set _before_ java-vm.mk is included

Fixes build failure when both openjdk8 and openjdk11 were installed,
openjdk8 would be picked


(abs)
diff -r1.12 -r1.13 pkgsrc/misc/libreoffice/options.mk
cvs diff -r1.12 -r1.13 pkgsrc/misc/libreoffice/options.mk (expand / switch to unified diff)

--- pkgsrc/misc/libreoffice/options.mk 2020/10/24 16:51:49 1.12
+++ pkgsrc/misc/libreoffice/options.mk 2020/10/26 12:44:21 1.13
@@ -1,39 +1,39 @@ @@ -1,39 +1,39 @@
1# $NetBSD: options.mk,v 1.12 2020/10/24 16:51:49 tnn Exp $ 1# $NetBSD: options.mk,v 1.13 2020/10/26 12:44:21 abs Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.libreoffice 3PKG_OPTIONS_VAR= PKG_OPTIONS.libreoffice
4PKG_SUPPORTED_OPTIONS= java debug gtk3 cups ldap dbus 4PKG_SUPPORTED_OPTIONS= java debug gtk3 cups ldap dbus
5PKG_SUGGESTED_OPTIONS= ldap dbus 5PKG_SUGGESTED_OPTIONS= ldap dbus
6 6
7.include "../../mk/bsd.prefs.mk" 7.include "../../mk/bsd.prefs.mk"
8 8
9# "checking the installed JDK... configure: error: JDK is too old, you need at least 9" 9# "checking the installed JDK... configure: error: JDK is too old, you need at least 9"
10# 10#
11# Only enable Java on platforms where OpenJDK>=9 is the default, 11# Only enable Java on platforms where OpenJDK>=9 is the default,
12# see mk/java-vm.mk 12# see mk/java-vm.mk
13.if !empty(MACHINE_PLATFORM:MNetBSD-[789].*-i386) || \ 13.if !empty(MACHINE_PLATFORM:MNetBSD-[789].*-i386) || \
14 !empty(MACHINE_PLATFORM:MNetBSD-[789].*-x86_64) 14 !empty(MACHINE_PLATFORM:MNetBSD-[789].*-x86_64)
15PKG_SUGGESTED_OPTIONS+= java 15PKG_SUGGESTED_OPTIONS+= java
16.endif 16.endif
17 17
18.include "../../mk/bsd.options.mk" 18.include "../../mk/bsd.options.mk"
19 19
20PLIST_VARS+= java gtk3 ldap 20PLIST_VARS+= java gtk3 ldap
21 21
22.if !empty(PKG_OPTIONS:Mjava) 22.if !empty(PKG_OPTIONS:Mjava)
 23USE_JAVA= yes
 24USE_JAVA2= 9
23.include "../../mk/java-env.mk" 25.include "../../mk/java-env.mk"
24.include "../../mk/java-vm.mk" 26.include "../../mk/java-vm.mk"
25USE_JAVA= yes 
26USE_JAVA2= yes 
27BUILD_DEPENDS+= apache-ant-[0-9]*:../../devel/apache-ant 27BUILD_DEPENDS+= apache-ant-[0-9]*:../../devel/apache-ant
28CONFIGURE_ARGS+= --with-ant-home=${PREFIX} 28CONFIGURE_ARGS+= --with-ant-home=${PREFIX}
29 29
30DEPENDS+= hsqldb18-[0-9]*:../../databases/hsqldb18 30DEPENDS+= hsqldb18-[0-9]*:../../databases/hsqldb18
31CONFIGURE_ARGS+= --with-hsqldb-jar=${PREFIX}/lib/java/hsqldb18/hsqldb.jar 31CONFIGURE_ARGS+= --with-hsqldb-jar=${PREFIX}/lib/java/hsqldb18/hsqldb.jar
32CONFIGURE_ARGS+= --enable-ext-wiki-publisher \ 32CONFIGURE_ARGS+= --enable-ext-wiki-publisher \
33 --with-java \ 33 --with-java \
34 --with-jdk-home=${PKG_JAVA_HOME} \ 34 --with-jdk-home=${PKG_JAVA_HOME} \
35 --without-system-beanshell \ 35 --without-system-beanshell \
36 --enable-scripting-beanshell \ 36 --enable-scripting-beanshell \
37 --with-system-hsqldb \ 37 --with-system-hsqldb \
38 --without-system-jfreereport 38 --without-system-jfreereport
39PLIST_SRC= ${PLIST_SRC_DFLT:Q} ${PKGDIR}/PLIST.java 39PLIST_SRC= ${PLIST_SRC_DFLT:Q} ${PKGDIR}/PLIST.java