CVS commit: pkgsrc/lang/go

"Jonathan Perkin" <[email protected]> Thu, 30 Jul 2026 22:11:56 +0000
Newsgroups gmane.os.netbsd.devel.pkgsrc.cvs
Message-ID <[email protected]>
Module Name:	pkgsrc
Committed By:	jperkin
Date:		Thu Jul 30 22:11:56 UTC 2026

Modified Files:
	pkgsrc/lang/go: go-module.mk go-package.mk

Log Message:
go: Switch to MAKE_JOBS_METHOD=manual and _MAKE_JOBS_N.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 pkgsrc/lang/go/go-module.mk
cvs rdiff -u -r1.31 -r1.32 pkgsrc/lang/go/go-package.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
(unnamed) (text/x-diff, 2.3 KB)
Modified files:

Index: pkgsrc/lang/go/go-module.mk
diff -u pkgsrc/lang/go/go-module.mk:1.27 pkgsrc/lang/go/go-module.mk:1.28
--- pkgsrc/lang/go/go-module.mk:1.27	Tue Jul 21 13:58:56 2026
+++ pkgsrc/lang/go/go-module.mk	Thu Jul 30 22:11:56 2026
@@ -1,4 +1,4 @@
-# $NetBSD: go-module.mk,v 1.27 2026/07/21 13:58:56 ryoon Exp $
+# $NetBSD: go-module.mk,v 1.28 2026/07/30 22:11:56 jperkin Exp $
 #
 # This file implements common logic for compiling Go programs in pkgsrc.
 #
@@ -46,7 +46,7 @@
 GO_BUILD_PATTERN?=	./...
 GO_EXTRA_MOD_DIRS?=
 
-MAKE_JOBS_SAFE=		no
+MAKE_JOBS_METHOD=	manual
 INSTALLATION_DIRS+=	bin
 USE_TOOLS+=		pax
 
@@ -75,7 +75,7 @@ GOPATH_BIN=	bin
 
 .endif
 
-ALL_ENV+=	GOMAXPROCS=${MAKE_JOBS:U1}
+ALL_ENV+=	GOMAXPROCS=${_MAKE_JOBS_N}
 
 post-extract: ${GO_CACHE_DIR}
 ${GO_CACHE_DIR}:
@@ -137,8 +137,8 @@ _USER_VARS.go=		GO_VERSION_DEFAULT
 _SYS_VARS.go=		GO GO_VERSION GOVERSSUFFIX GOARCH GOCHAR \
 			GOOPT GOTOOLDIR GO_PLATFORM GO_CACHE_DIR
 _DEF_VARS.go=		GO14_VERSION GO19_VERSION GO110_VERSION \
-			GO111_VERSION INSTALLATION_DIRS MAKE_JOBS_SAFE \
-			NOT_FOR_PLATFORM ONLY_FOR_PLATFORM SSP_SUPPORTED \
-			WRKSRC
+			GO111_VERSION INSTALLATION_DIRS _MAKE_JOBS_N \
+			MAKE_JOBS_METHOD NOT_FOR_PLATFORM ONLY_FOR_PLATFORM \
+			SSP_SUPPORTED WRKSRC
 _USE_VARS.go=		GO_PACKAGE_DEP
 _SORTED_VARS.go=	INSTALLATION_DIRS *_FOR_PLATFORM

Index: pkgsrc/lang/go/go-package.mk
diff -u pkgsrc/lang/go/go-package.mk:1.31 pkgsrc/lang/go/go-package.mk:1.32
--- pkgsrc/lang/go/go-package.mk:1.31	Fri Sep 26 15:37:41 2025
+++ pkgsrc/lang/go/go-package.mk	Thu Jul 30 22:11:56 2026
@@ -1,4 +1,4 @@
-# $NetBSD: go-package.mk,v 1.31 2025/09/26 15:37:41 schmonz Exp $
+# $NetBSD: go-package.mk,v 1.32 2026/07/30 22:11:56 jperkin Exp $
 #
 # This file implements common logic for compiling Go programs in pkgsrc.
 #
@@ -59,7 +59,7 @@ GO_BUILD_PATTERN?=	${GO_SRCPATH}/...
 
 WRKSRC=			${WRKDIR}/src/${GO_SRCPATH}
 
-MAKE_JOBS_SAFE=		no
+MAKE_JOBS_METHOD=	manual
 INSTALLATION_DIRS+=	bin gopkg
 USE_TOOLS+=		pax
 
@@ -133,7 +133,7 @@ _SYS_VARS.go=		GO GO_VERSION GOVERSSUFFI
 _USE_VARS.go=		GO_PACKAGE_DEP \
 			WRKDIR BUILDLINK_DIR DESTDIR PREFIX \
 			TEST_ENV
-_DEF_VARS.go=		INSTALLATION_DIRS MAKE_JOBS_SAFE \
+_DEF_VARS.go=		INSTALLATION_DIRS MAKE_JOBS_METHOD \
 			WRKSRC \
 			USE_TOOLS TOOL_DEPENDS PRINT_PLIST_AWK MAKE_ENV
 _SORTED_VARS.go=	INSTALLATION_DIRS *_FOR_PLATFORM *_ENV