CVS commit: pkgsrc/lang
"Jonathan Perkin" <[email protected]> Thu, 30 Jul 2026 16:20:43 +0000
| Newsgroups | gmane.os.netbsd.devel.pkgsrc.cvs |
|---|---|
| Message-ID | <[email protected]> |
Module Name: pkgsrc Committed By: jperkin Date: Thu Jul 30 16:20:43 UTC 2026 Modified Files: pkgsrc/lang/openjdk11: Makefile pkgsrc/lang/openjdk17: Makefile pkgsrc/lang/openjdk21: Makefile Log Message: openjdk*: Use new MAKE_JOBS_METHOD=manual setting. Ensures parallel builds are supported in tools such as pkgtools/bob that treat MAKE_JOBS_SAFE=no as a marker that the package should receive MAKE_JOBS=1. To generate a diff of this commit: cvs rdiff -u -r1.86 -r1.87 pkgsrc/lang/openjdk11/Makefile cvs rdiff -u -r1.45 -r1.46 pkgsrc/lang/openjdk17/Makefile cvs rdiff -u -r1.29 -r1.30 pkgsrc/lang/openjdk21/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
(unnamed)
(text/x-diff, 2.7 KB)
Modified files:
Index: pkgsrc/lang/openjdk11/Makefile
diff -u pkgsrc/lang/openjdk11/Makefile:1.86 pkgsrc/lang/openjdk11/Makefile:1.87
--- pkgsrc/lang/openjdk11/Makefile:1.86 Thu May 14 16:41:21 2026
+++ pkgsrc/lang/openjdk11/Makefile Thu Jul 30 16:20:42 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.86 2026/05/14 16:41:21 ryoon Exp $
+# $NetBSD: Makefile,v 1.87 2026/07/30 16:20:42 jperkin Exp $
DISTNAME= jdk11u-${GITHUB_TAG:C/\+/-/}
PKGNAME= openjdk11-1.${GITHUB_TAG:C/\+/./:C/jdk-([.0-9]+).*/\1/}
@@ -50,8 +50,8 @@ BOOT_JVMARGS= -XX:+UnlockDiagnosticVMOpt
-XX:-UseSemaphoreGCThreadsSynchronization
# ${WRKSRC}/doc/building.mk explicitly states that its Makefiles are unsafe
-# to use -j.
-MAKE_JOBS_SAFE= no
+# to use -j. Disable it and configure ourselves via configure arguments.
+MAKE_JOBS_METHOD= manual
CONFIGURE_ARGS+= --openjdk-target=${MACHINE_GNU_PLATFORM:Q}
CONFIGURE_ARGS+= --with-boot-jdk=${ALT_BOOTDIR}
Index: pkgsrc/lang/openjdk17/Makefile
diff -u pkgsrc/lang/openjdk17/Makefile:1.45 pkgsrc/lang/openjdk17/Makefile:1.46
--- pkgsrc/lang/openjdk17/Makefile:1.45 Thu May 14 16:41:21 2026
+++ pkgsrc/lang/openjdk17/Makefile Thu Jul 30 16:20:43 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2026/05/14 16:41:21 ryoon Exp $
+# $NetBSD: Makefile,v 1.46 2026/07/30 16:20:43 jperkin Exp $
DISTNAME= jdk17u-${GITHUB_TAG:C/\+/-/}
PKGNAME= openjdk17-1.${GITHUB_TAG:C/\+/./:C/jdk-([.0-9]+).*/\1/}
@@ -60,8 +60,8 @@ BUILDLINK_PASSTHRU_DIRS+= ${ALT_BOOTDIR}
BOOT_JVMARGS= -XX:+UnlockDiagnosticVMOptions
# ${WRKSRC}/doc/building.mk explicitly states that its Makefiles are unsafe
-# to use -j.
-MAKE_JOBS_SAFE= no
+# to use -j. Disable it and configure ourselves via configure arguments.
+MAKE_JOBS_METHOD= manual
CONFIGURE_ARGS+= --openjdk-target=${MACHINE_GNU_PLATFORM}
CONFIGURE_ARGS+= --with-boot-jdk=${ALT_BOOTDIR}
Index: pkgsrc/lang/openjdk21/Makefile
diff -u pkgsrc/lang/openjdk21/Makefile:1.29 pkgsrc/lang/openjdk21/Makefile:1.30
--- pkgsrc/lang/openjdk21/Makefile:1.29 Thu May 14 16:41:21 2026
+++ pkgsrc/lang/openjdk21/Makefile Thu Jul 30 16:20:43 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2026/05/14 16:41:21 ryoon Exp $
+# $NetBSD: Makefile,v 1.30 2026/07/30 16:20:43 jperkin Exp $
DISTNAME= jdk21u-${GITHUB_TAG:C/\+/-/}
PKGNAME= openjdk21-1.${GITHUB_TAG:C/\+/./:C/jdk-([.0-9]+).*/\1/}
@@ -61,8 +61,8 @@ BUILDLINK_PASSTHRU_DIRS+= ${ALT_BOOTDIR}
BOOT_JVMARGS= -XX:+UnlockDiagnosticVMOptions
# ${WRKSRC}/doc/building.mk explicitly states that its Makefiles are unsafe
-# to use -j.
-MAKE_JOBS_SAFE= no
+# to use -j. Disable it and configure ourselves via configure arguments.
+MAKE_JOBS_METHOD= manual
CONFIGURE_ARGS+= --openjdk-target=${MACHINE_GNU_PLATFORM}
CONFIGURE_ARGS+= --with-boot-jdk=${ALT_BOOTDIR}