CVS commit: pkgsrc/lang/openjdk21

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Wed Dec  6 12:51:24 UTC 2023

Modified Files:
        pkgsrc/lang/openjdk21: Makefile PLIST options.mk

Log Message:
openjdk21: add PKG_OPTION for bundled zlib and suggest on NetBSD <10

jlink(1) produces corrupt binaries when compiled against system
zlib-1.2.10 as found on NetBSD 9. System zlib-1.2.13 works OK.

TODO revbump after bootstrap regen


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/openjdk21/Makefile \
    pkgsrc/lang/openjdk21/PLIST
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/openjdk21/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/openjdk21/Makefile
diff -u pkgsrc/lang/openjdk21/Makefile:1.1 pkgsrc/lang/openjdk21/Makefile:1.2
--- pkgsrc/lang/openjdk21/Makefile:1.1  Wed Nov 22 14:06:50 2023
+++ pkgsrc/lang/openjdk21/Makefile      Wed Dec  6 12:51:24 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2023/11/22 14:06:50 ryoon Exp $
+# $NetBSD: Makefile,v 1.2 2023/12/06 12:51:24 tnn Exp $
 
 DISTNAME=      jdk21u-${GITHUB_TAG:C/\+/-/}
 PKGNAME=       openjdk21-1.${GITHUB_TAG:C/\+/./:C/jdk-([.0-9]+).*/\1/}
@@ -60,7 +60,6 @@ BOOT_JVMARGS= -XX:+UnlockDiagnosticVMOpt
 CONFIGURE_ARGS+=       --openjdk-target=${MACHINE_GNU_PLATFORM}
 CONFIGURE_ARGS+=       --with-boot-jdk=${ALT_BOOTDIR}
 CONFIGURE_ARGS+=       --with-boot-jdk-jvmargs=${BOOT_JVMARGS:Q}
-CONFIGURE_ARGS+=       --with-zlib=system
 CONFIGURE_ARGS+=       --with-giflib=bundled
 CONFIGURE_ARGS+=       --with-lcms=bundled
 CONFIGURE_ARGS+=       --with-cups-include=${BUILDLINK_PREFIX.libcups}/include
@@ -199,7 +198,6 @@ do-install:
 CONFIGURE_ARGS+=       --with-alsa=${BUILDLINK_PREFIX.alsa-lib}
 .endif
 .include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 # Headers from CUPS are required to build the native implementation of
Index: pkgsrc/lang/openjdk21/PLIST
diff -u pkgsrc/lang/openjdk21/PLIST:1.1 pkgsrc/lang/openjdk21/PLIST:1.2
--- pkgsrc/lang/openjdk21/PLIST:1.1     Wed Nov 22 14:06:50 2023
+++ pkgsrc/lang/openjdk21/PLIST Wed Dec  6 12:51:24 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2023/11/22 14:06:50 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.2 2023/12/06 12:51:24 tnn Exp $
 bin/openjdk21-jar
 bin/openjdk21-jarsigner
 bin/openjdk21-java
@@ -260,6 +260,7 @@ java/openjdk21/legal/java.base/cldr.md
 java/openjdk21/legal/java.base/icu.md
 java/openjdk21/legal/java.base/public_suffix.md
 java/openjdk21/legal/java.base/unicode.md
+${PLIST.jdk_bundled_zlib}java/openjdk21/legal/java.base/zlib.md
 java/openjdk21/legal/java.compiler/ADDITIONAL_LICENSE_INFO
 java/openjdk21/legal/java.compiler/ASSEMBLY_EXCEPTION
 java/openjdk21/legal/java.compiler/LICENSE

Index: pkgsrc/lang/openjdk21/options.mk
diff -u pkgsrc/lang/openjdk21/options.mk:1.2 pkgsrc/lang/openjdk21/options.mk:1.3
--- pkgsrc/lang/openjdk21/options.mk:1.2        Sun Nov 26 19:00:51 2023
+++ pkgsrc/lang/openjdk21/options.mk    Wed Dec  6 12:51:24 2023
@@ -1,9 +1,9 @@
-# $NetBSD: options.mk,v 1.2 2023/11/26 19:00:51 tnn Exp $
+# $NetBSD: options.mk,v 1.3 2023/12/06 12:51:24 tnn Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.openjdk21
 PKG_OPTIONS_OPTIONAL_GROUPS=   variant
 PKG_OPTIONS_GROUP.variant=     jdk-zero-vm
-PKG_SUPPORTED_OPTIONS=         debug dtrace jre-jce x11 static-libstdcpp
+PKG_SUPPORTED_OPTIONS=         debug dtrace jre-jce x11 static-libstdcpp jdk-bundled-zlib
 PKG_SUGGESTED_OPTIONS=         jre-jce x11
 
 .if ${MACHINE_ARCH} == "aarch64" || ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
@@ -13,6 +13,10 @@ PKG_SUGGESTED_OPTIONS+=              jdk-hotspot-vm
 PKG_SUGGESTED_OPTIONS+=                jdk-zero-vm
 .endif
 
+.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 100000
+PKG_SUGGESTED_OPTIONS+=                jdk-bundled-zlib
+.endif
+
 .include "../../mk/bsd.options.mk"
 
 ###
@@ -108,3 +112,12 @@ BUILD_VARIANT=             server
 PLIST.hotspot=         yes
 .endif
 CONFIGURE_ARGS+=       --with-jvm-variants=${BUILD_VARIANT}
+
+PLIST_VARS+=           jdk_bundled_zlib
+.if !empty(PKG_OPTIONS:Mjdk-bundled-zlib)
+PLIST.jdk_bundled_zlib=        yes
+CONFIGURE_ARGS+=       --with-zlib=bundled
+.else
+CONFIGURE_ARGS+=       --with-zlib=system
+.include "../../devel/zlib/buildlink3.mk"
+.endif