CVS commit: pkgsrc/lang

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Fri May  1 14:09:15 UTC 2020

Modified Files:
        pkgsrc/lang/go110: Makefile
        pkgsrc/lang/go113: Makefile
        pkgsrc/lang/go114: Makefile
        pkgsrc/lang/go19: Makefile
Added Files:
        pkgsrc/lang/go: bootstrap.mk

Log Message:
go*: move definition of GOROOT_BOOTSTRAP to go/bootstrap.mk.

NFC. But will later need to do something else when MACHINE_ARCH == aarch64.
Also drop dup include of bsd.prefs.mk. go/version.mk does this already.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 pkgsrc/lang/go/bootstrap.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/go110/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/go113/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/go114/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/go19/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/go110/Makefile
diff -u pkgsrc/lang/go110/Makefile:1.4 pkgsrc/lang/go110/Makefile:1.5
--- pkgsrc/lang/go110/Makefile:1.4      Sun Jan 26 17:31:28 2020
+++ pkgsrc/lang/go110/Makefile  Fri May  1 14:09:15 2020
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2020/01/26 17:31:28 rillig Exp $
+# $NetBSD: Makefile,v 1.5 2020/05/01 14:09:15 tnn Exp $
 
 PKGREVISION= 1
 .include "../../lang/go/version.mk"
+.include "../../lang/go/bootstrap.mk"
 
 DISTNAME=      go${GO110_VERSION}.src
 PKGNAME=       go110-${GO110_VERSION}
@@ -80,11 +81,6 @@ CHECK_INTERPRETER_SKIP+=     go${GOVERSSUFFI
 CHECK_INTERPRETER_SKIP+=       go${GOVERSSUFFIX}/src/make.rc
 CHECK_INTERPRETER_SKIP+=       go${GOVERSSUFFIX}/src/run.rc
 
-BUILD_DEPENDS+=                go14-1.4*:../../lang/go14
-GOROOT_BOOTSTRAP=      ${PREFIX}/go14
-
-.include "../../mk/bsd.prefs.mk"
-
 PLIST_VARS+=   pty route
 
 .if ${OPSYS} != "SunOS"

Index: pkgsrc/lang/go113/Makefile
diff -u pkgsrc/lang/go113/Makefile:1.2 pkgsrc/lang/go113/Makefile:1.3
--- pkgsrc/lang/go113/Makefile:1.2      Sun Jan 26 17:31:28 2020
+++ pkgsrc/lang/go113/Makefile  Fri May  1 14:09:15 2020
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2020/01/26 17:31:28 rillig Exp $
+# $NetBSD: Makefile,v 1.3 2020/05/01 14:09:15 tnn Exp $
 
 .include "../../lang/go/version.mk"
+.include "../../lang/go/bootstrap.mk"
 
 DISTNAME=      go${GO113_VERSION}.src
 PKGNAME=       go113-${GO113_VERSION}
@@ -75,9 +76,6 @@ CHECK_INTERPRETER_SKIP+=      go${GOVERSSUFFI
 CHECK_INTERPRETER_SKIP+=       go${GOVERSSUFFIX}/src/make.rc
 CHECK_INTERPRETER_SKIP+=       go${GOVERSSUFFIX}/src/run.rc
 
-BUILD_DEPENDS+=                go14-1.4*:../../lang/go14
-GOROOT_BOOTSTRAP=      ${PREFIX}/go14
-
 PLIST_SUBST+=  GOVERSSUFFIX=${GOVERSSUFFIX}
 
 .include "../../mk/bsd.prefs.mk"

Index: pkgsrc/lang/go114/Makefile
diff -u pkgsrc/lang/go114/Makefile:1.1 pkgsrc/lang/go114/Makefile:1.2
--- pkgsrc/lang/go114/Makefile:1.1      Thu Feb 27 14:32:57 2020
+++ pkgsrc/lang/go114/Makefile  Fri May  1 14:09:15 2020
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2020/02/27 14:32:57 bsiegert Exp $
+# $NetBSD: Makefile,v 1.2 2020/05/01 14:09:15 tnn Exp $
 
 .include "../../lang/go/version.mk"
+.include "../../lang/go/bootstrap.mk"
 
 DISTNAME=      go${GO114_VERSION}.src
 PKGNAME=       go114-${GO114_VERSION}
@@ -65,13 +66,8 @@ CHECK_INTERPRETER_SKIP+=     go${GOVERSSUFFI
 CHECK_INTERPRETER_SKIP+=       go${GOVERSSUFFIX}/src/make.rc
 CHECK_INTERPRETER_SKIP+=       go${GOVERSSUFFIX}/src/run.rc
 
-BUILD_DEPENDS+=                go14-1.4*:../../lang/go14
-GOROOT_BOOTSTRAP=      ${PREFIX}/go14
-
 PLIST_SUBST+=  GOVERSSUFFIX=${GOVERSSUFFIX}
 
-.include "../../mk/bsd.prefs.mk"
-
 PLIST_VARS+=   pty route
 
 .if ${OPSYS} != "SunOS"

Index: pkgsrc/lang/go19/Makefile
diff -u pkgsrc/lang/go19/Makefile:1.5 pkgsrc/lang/go19/Makefile:1.6
--- pkgsrc/lang/go19/Makefile:1.5       Sun Jan 26 17:31:28 2020
+++ pkgsrc/lang/go19/Makefile   Fri May  1 14:09:15 2020
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2020/01/26 17:31:28 rillig Exp $
+# $NetBSD: Makefile,v 1.6 2020/05/01 14:09:15 tnn Exp $
 
 PKGREVISION= 2
 .include "../../lang/go/version.mk"
+.include "../../lang/go/bootstrap.mk"
 
 DISTNAME=      go${GO19_VERSION}.src
 PKGNAME=       go19-${GO19_VERSION}
@@ -80,11 +81,6 @@ CHECK_INTERPRETER_SKIP+=     go19/src/clean.
 CHECK_INTERPRETER_SKIP+=       go19/src/make.rc
 CHECK_INTERPRETER_SKIP+=       go19/src/run.rc
 
-BUILD_DEPENDS+=                go14-1.4*:../../lang/go14
-GOROOT_BOOTSTRAP=      ${PREFIX}/go14
-
-.include "../../mk/bsd.prefs.mk"
-
 PLIST_VARS+=   route
 
 .if ${OPSYS} != "Linux" && ${OPSYS} != "SunOS"

Added files:

Index: pkgsrc/lang/go/bootstrap.mk
diff -u /dev/null pkgsrc/lang/go/bootstrap.mk:1.1
--- /dev/null   Fri May  1 14:09:15 2020
+++ pkgsrc/lang/go/bootstrap.mk Fri May  1 14:09:14 2020
@@ -0,0 +1,4 @@
+# $NetBSD: bootstrap.mk,v 1.1 2020/05/01 14:09:14 tnn Exp $
+
+BUILD_DEPENDS+=                go14-1.4*:../../lang/go14
+GOROOT_BOOTSTRAP=      ${PREFIX}/go14