pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/lang



Module Name:    pkgsrc
Committed By:   gdt
Date:           Sat May 30 15:13:14 UTC 2026

Modified Files:
        pkgsrc/lang/go118: Makefile
        pkgsrc/lang/go120: Makefile
        pkgsrc/lang/go123: Makefile
        pkgsrc/lang/go124: Makefile
        pkgsrc/lang/go125: Makefile

Log Message:
lang/go{118,120,123,124,125}: Respect MAKE_JOBS

Fix copied from go126, as proposed on tech-pkg@.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/lang/go118/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/go120/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/lang/go123/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/go124/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/go125/Makefile

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

Modified files:

Index: pkgsrc/lang/go118/Makefile
diff -u pkgsrc/lang/go118/Makefile:1.7 pkgsrc/lang/go118/Makefile:1.8
--- pkgsrc/lang/go118/Makefile:1.7      Sat Jul 15 10:52:59 2023
+++ pkgsrc/lang/go118/Makefile  Sat May 30 15:13:13 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2023/07/15 10:52:59 bsiegert Exp $
+# $NetBSD: Makefile,v 1.8 2026/05/30 15:13:13 gdt Exp $
 
 PKGREVISION= 1
 .include "../../lang/go/version.mk"
@@ -101,9 +101,14 @@ PRINT_PLIST_AWK+=  /x\/net\/route\.a/ { p
 post-extract:
        ${RM} -r -f ${WRKSRC}/test/fixedbugs/issue27836*
 
+# By default, go build invokes unreasonable parallelism.  Rather than
+# ${MAKE_JOBS} of 1 thread as with make, we run just "go build" (1
+# job) and tell it to not exceed ${MAKE_JOBS} threads.  This is sound
+# because there is no make with -jN args also.
 do-build:
        cd ${WRKSRC}/src && \
                env \
+               GOMAXPROCS=${MAKE_JOBS:U1} \
                GOROOT_BOOTSTRAP=${GOROOT_BOOTSTRAP:Q} \
                GOROOT_FINAL=${GOROOT_FINAL:Q} \
                ${GOOPT} \

Index: pkgsrc/lang/go120/Makefile
diff -u pkgsrc/lang/go120/Makefile:1.4 pkgsrc/lang/go120/Makefile:1.5
--- pkgsrc/lang/go120/Makefile:1.4      Sun Sep 14 23:48:02 2025
+++ pkgsrc/lang/go120/Makefile  Sat May 30 15:13:14 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2025/09/14 23:48:02 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2026/05/30 15:13:14 gdt Exp $
 
 .include "../../lang/go/version.mk"
 # Minimum Go version for bootstrapping is 1.17.13.
@@ -95,9 +95,14 @@ PRINT_PLIST_AWK+=    /^bin\/gofmt${GOVERSSU
 post-extract:
        ${RM} -r -f ${WRKSRC}/test/fixedbugs/issue27836*
 
+# By default, go build invokes unreasonable parallelism.  Rather than
+# ${MAKE_JOBS} of 1 thread as with make, we run just "go build" (1
+# job) and tell it to not exceed ${MAKE_JOBS} threads.  This is sound
+# because there is no make with -jN args also.
 do-build:
        cd ${WRKSRC}/src && \
                env \
+               GOMAXPROCS=${MAKE_JOBS:U1} \
                GOROOT_BOOTSTRAP=${GOROOT_BOOTSTRAP:Q} \
                GOROOT_FINAL=${GOROOT_FINAL:Q} \
                ${GOOPT} \

Index: pkgsrc/lang/go123/Makefile
diff -u pkgsrc/lang/go123/Makefile:1.8 pkgsrc/lang/go123/Makefile:1.9
--- pkgsrc/lang/go123/Makefile:1.8      Fri Feb  7 10:17:49 2025
+++ pkgsrc/lang/go123/Makefile  Sat May 30 15:13:14 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2025/02/07 10:17:49 bsiegert Exp $
+# $NetBSD: Makefile,v 1.9 2026/05/30 15:13:14 gdt Exp $
 
 .include "../../lang/go/version.mk"
 GO_BOOTSTRAP_REQD=     120
@@ -102,9 +102,14 @@ post-extract:
 post-patch:
        ${RM} -f ${WRKSRC}/src/os/*.orig_dist
 
+# By default, go build invokes unreasonable parallelism.  Rather than
+# ${MAKE_JOBS} of 1 thread as with make, we run just "go build" (1
+# job) and tell it to not exceed ${MAKE_JOBS} threads.  This is sound
+# because there is no make with -jN args also.
 do-build:
        cd ${WRKSRC}/src && \
                env \
+               GOMAXPROCS=${MAKE_JOBS:U1} \
                GOROOT_BOOTSTRAP=${GOROOT_BOOTSTRAP:Q} \
                ${GOOPT} \
                GOCACHE=${WRKDIR}/.cache/go-build \

Index: pkgsrc/lang/go124/Makefile
diff -u pkgsrc/lang/go124/Makefile:1.2 pkgsrc/lang/go124/Makefile:1.3
--- pkgsrc/lang/go124/Makefile:1.2      Tue Dec  2 19:24:16 2025
+++ pkgsrc/lang/go124/Makefile  Sat May 30 15:13:14 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2025/12/02 19:24:16 bsiegert Exp $
+# $NetBSD: Makefile,v 1.3 2026/05/30 15:13:14 gdt Exp $
 
 .include "../../lang/go/version.mk"
 GO_BOOTSTRAP_REQD=     122
@@ -96,9 +96,14 @@ PRINT_PLIST_AWK+=    /^bin\/gofmt${GOVERSSU
 post-extract:
        ${RM} -r -f ${WRKSRC}/test/fixedbugs/issue27836*
 
+# By default, go build invokes unreasonable parallelism.  Rather than
+# ${MAKE_JOBS} of 1 thread as with make, we run just "go build" (1
+# job) and tell it to not exceed ${MAKE_JOBS} threads.  This is sound
+# because there is no make with -jN args also.
 do-build:
        cd ${WRKSRC}/src && \
                env \
+               GOMAXPROCS=${MAKE_JOBS:U1} \
                GOROOT_BOOTSTRAP=${GOROOT_BOOTSTRAP:Q} \
                ${GOOPT} \
                GOCACHE=${WRKDIR}/.cache/go-build \

Index: pkgsrc/lang/go125/Makefile
diff -u pkgsrc/lang/go125/Makefile:1.4 pkgsrc/lang/go125/Makefile:1.5
--- pkgsrc/lang/go125/Makefile:1.4      Tue Dec 23 19:32:53 2025
+++ pkgsrc/lang/go125/Makefile  Sat May 30 15:13:14 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2025/12/23 19:32:53 bsiegert Exp $
+# $NetBSD: Makefile,v 1.5 2026/05/30 15:13:14 gdt Exp $
 
 .include "../../lang/go/version.mk"
 GO_BOOTSTRAP_REQD=     122
@@ -104,9 +104,14 @@ post-extract:
 post-patch:
        ${RM} -f ${WRKSRC}/src/cmd/link/internal/x86/*.orig_dist
 
+# By default, go build invokes unreasonable parallelism.  Rather than
+# ${MAKE_JOBS} of 1 thread as with make, we run just "go build" (1
+# job) and tell it to not exceed ${MAKE_JOBS} threads.  This is sound
+# because there is no make with -jN args also.
 do-build:
        cd ${WRKSRC}/src && \
                env \
+               GOMAXPROCS=${MAKE_JOBS:U1} \
                GOROOT_BOOTSTRAP=${GOROOT_BOOTSTRAP:Q} \
                ${GOOPT} \
                GOCACHE=${WRKDIR}/.cache/go-build \



Home | Main Index | Thread Index | Old Index