CVS commit: pkgsrc/lang/go14

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Sat Sep  2 17:15:00 UTC 2017

Modified Files:
        pkgsrc/lang/go14: Makefile PLIST

Log Message:
Disable cgo, bump PKGREVISION.

"The bitrot will continue until morale improves."

Go 1.4 is only used as a bootstrap helper to compile a more recent Go.
However, cgo in 1.4 no longer works with current binutils.

Prodded by Thomas Orgis on the mailing list.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/lang/go14/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/go14/PLIST

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

Modified files:

Index: pkgsrc/lang/go14/Makefile
diff -u pkgsrc/lang/go14/Makefile:1.12 pkgsrc/lang/go14/Makefile:1.13
--- pkgsrc/lang/go14/Makefile:1.12      Sat Jul 22 19:32:41 2017
+++ pkgsrc/lang/go14/Makefile   Sat Sep  2 17:15:00 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.12 2017/07/22 19:32:41 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2017/09/02 17:15:00 bsiegert Exp $
 
 .include "../../lang/go/version.mk"
 
 DISTNAME=      go${GO14_VERSION}.src
 PKGNAME=       go14-${GO14_VERSION}
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    lang
 MASTER_SITES=  https://storage.googleapis.com/golang/
 PATCH_SITES=   https://codereview.appspot.com/download/
@@ -27,6 +27,9 @@ BUILDLINK_PASSTHRU_DIRS+= ${TMPDIR}
 GOROOT_FINAL=  ${PREFIX}/go14
 INSTALLATION_DIRS= go14
 
+MAKE_ENV+=     GOROOT_FINAL=${GOROOT_FINAL:Q}
+MAKE_ENV+=     CGO_ENABLED=0
+
 REPLACE_BASH+= doc/articles/wiki/test.bash
 REPLACE_BASH+= doc/codewalk/run
 REPLACE_BASH+= doc/progs/run
@@ -76,7 +79,7 @@ CHECK_INTERPRETER_SKIP+=      go14/src/make.r
 CHECK_INTERPRETER_SKIP+=       go14/src/run.rc
 
 do-build:
-       cd ${WRKSRC}/src && env GOROOT_FINAL=${GOROOT_FINAL:Q} ${BASH} ./make.bash
+       cd ${WRKSRC}/src && ${PKGSRC_SETENV} ${MAKE_ENV} ${BASH} ./make.bash
 
 do-install:
        cd ${WRKSRC} && rm -rf .hgignore .hgtags pkg/obj

Index: pkgsrc/lang/go14/PLIST
diff -u pkgsrc/lang/go14/PLIST:1.2 pkgsrc/lang/go14/PLIST:1.3
--- pkgsrc/lang/go14/PLIST:1.2  Sat Sep 26 17:37:01 2015
+++ pkgsrc/lang/go14/PLIST      Sat Sep  2 17:15:00 2017
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2015/09/26 17:37:01 bsiegert Exp $
+@comment $NetBSD: PLIST,v 1.3 2017/09/02 17:15:00 bsiegert Exp $
 go14/AUTHORS
 go14/CONTRIBUTORS
 go14/LICENSE
@@ -492,7 +492,6 @@ go14/pkg/${GO_PLATFORM}/regexp.a
 go14/pkg/${GO_PLATFORM}/regexp/syntax.a
 go14/pkg/${GO_PLATFORM}/runtime.a
 go14/pkg/${GO_PLATFORM}/runtime.h
-go14/pkg/${GO_PLATFORM}/runtime/cgo.a
 go14/pkg/${GO_PLATFORM}/runtime/debug.a
 go14/pkg/${GO_PLATFORM}/runtime/pprof.a
 go14/pkg/${GO_PLATFORM}/runtime/race.a