[pkgsrc/trunk]: pkgsrc/lang go113, go114: when bootstrapped using a modules c...

[maya <maya%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ca26e95114a7
branches:  trunk
changeset: 431016:ca26e95114a7
user:      maya <maya%pkgsrc.org@localhost>
date:      Fri May 08 00:49:59 2020 +0000

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

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

diffstat:

 lang/go113/Makefile |  10 ++++++++--
 lang/go114/Makefile |  10 ++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diffs (48 lines):

diff -r c6966cb970fa -r ca26e95114a7 lang/go113/Makefile
--- a/lang/go113/Makefile       Thu May 07 20:45:49 2020 +0000
+++ b/lang/go113/Makefile       Fri May 08 00:49:59 2020 +0000
@@ -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 @@
        ${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
 
diff -r c6966cb970fa -r ca26e95114a7 lang/go114/Makefile
--- a/lang/go114/Makefile       Thu May 07 20:45:49 2020 +0000
+++ b/lang/go114/Makefile       Fri May 08 00:49:59 2020 +0000
@@ -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 @@
        ${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