CVS commit: pkgsrc/lang

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Fri May  8 00:49:59 UTC 2020

Modified Files:
        pkgsrc/lang/go113: Makefile
        pkgsrc/lang/go114: Makefile

Log Message:
go113, go114: when bootstrapped using a modules capable Go bootstrap,

put the cache in the work directory. Helps bulk building on netbsd/aarch64.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/go113/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/go114/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/go113/Makefile
diff -u pkgsrc/lang/go113/Makefile:1.4 pkgsrc/lang/go113/Makefile:1.5
--- pkgsrc/lang/go113/Makefile:1.4      Fri May  1 14:11:16 2020
+++ pkgsrc/lang/go113/Makefile  Fri May  8 00:49:59 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2020/05/01 14:11:16 tnn Exp $
+# $NetBSD: Makefile,v 1.5 2020/05/08 00:49:59 maya Exp $
 
 .include "../../lang/go/version.mk"
 .include "../../lang/go/bootstrap.mk"
@@ -92,7 +92,13 @@ post-extract:
        ${RM} -r -f ${WRKSRC}/test/fixedbugs/issue27836*
 
 do-build:
-       cd ${WRKSRC}/src && env GOROOT_BOOTSTRAP=${GOROOT_BOOTSTRAP:Q} GOROOT_FINAL=${GOROOT_FINAL:Q} ${GOOPT} ${BASH} ./make.bash
+       cd ${WRKSRC}/src && \
+               env \
+               GOROOT_BOOTSTRAP=${GOROOT_BOOTSTRAP:Q} \
+               GOROOT_FINAL=${GOROOT_FINAL:Q} \
+               ${GOOPT} \
+               GOCACHE=${WRKDIR}/.cache/go-build \
+               ${BASH} ./make.bash
 # for RELRO build:
 #      cd ${WRKSRC}/src && env GOROOT_BOOTSTRAP=${GOROOT_BOOTSTRAP:Q} GOROOT_FINAL=${GOROOT_FINAL:Q} GO_LDFLAGS="-buildmode=pie" ${GOOPT} ${BASH} ./make.bash
 

Index: pkgsrc/lang/go114/Makefile
diff -u pkgsrc/lang/go114/Makefile:1.2 pkgsrc/lang/go114/Makefile:1.3
--- pkgsrc/lang/go114/Makefile:1.2      Fri May  1 14:09:15 2020
+++ pkgsrc/lang/go114/Makefile  Fri May  8 00:49:59 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2020/05/01 14:09:15 tnn Exp $
+# $NetBSD: Makefile,v 1.3 2020/05/08 00:49:59 maya Exp $
 
 .include "../../lang/go/version.mk"
 .include "../../lang/go/bootstrap.mk"
@@ -82,7 +82,13 @@ post-extract:
        ${RM} -r -f ${WRKSRC}/test/fixedbugs/issue27836*
 
 do-build:
-       cd ${WRKSRC}/src && env GOROOT_BOOTSTRAP=${GOROOT_BOOTSTRAP:Q} GOROOT_FINAL=${GOROOT_FINAL:Q} ${GOOPT} ${BASH} ./make.bash
+       cd ${WRKSRC}/src && \
+               env \
+               GOROOT_BOOTSTRAP=${GOROOT_BOOTSTRAP:Q} \
+               GOROOT_FINAL=${GOROOT_FINAL:Q} \
+               ${GOOPT} \
+               GOCACHE=${WRKDIR}/.cache/go-build \
+               ${BASH} ./make.bash
 # for RELRO build:
 #      cd ${WRKSRC}/src && env GOROOT_BOOTSTRAP=${GOROOT_BOOTSTRAP:Q} GOROOT_FINAL=${GOROOT_FINAL:Q} GO_LDFLAGS="-buildmode=pie" ${GOOPT} ${BASH} ./make.bash