Source-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/lang go*: move definition of GOROOT_BOOTSTRAP to go/bo...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/5c55e9383b06
branches:  trunk
changeset: 430513:5c55e9383b06
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Fri May 01 14:09:14 2020 +0000

description:
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.

diffstat:

 lang/go/bootstrap.mk |  4 ++++
 lang/go110/Makefile  |  8 ++------
 lang/go113/Makefile  |  6 ++----
 lang/go114/Makefile  |  8 ++------
 lang/go19/Makefile   |  8 ++------
 5 files changed, 12 insertions(+), 22 deletions(-)

diffs (106 lines):

diff -r c690614bb004 -r 5c55e9383b06 lang/go/bootstrap.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/go/bootstrap.mk      Fri May 01 14:09:14 2020 +0000
@@ -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
diff -r c690614bb004 -r 5c55e9383b06 lang/go110/Makefile
--- a/lang/go110/Makefile       Fri May 01 13:52:04 2020 +0000
+++ b/lang/go110/Makefile       Fri May 01 14:09:14 2020 +0000
@@ -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${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"
diff -r c690614bb004 -r 5c55e9383b06 lang/go113/Makefile
--- a/lang/go113/Makefile       Fri May 01 13:52:04 2020 +0000
+++ b/lang/go113/Makefile       Fri May 01 14:09:14 2020 +0000
@@ -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${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"
diff -r c690614bb004 -r 5c55e9383b06 lang/go114/Makefile
--- a/lang/go114/Makefile       Fri May 01 13:52:04 2020 +0000
+++ b/lang/go114/Makefile       Fri May 01 14:09:14 2020 +0000
@@ -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${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"
diff -r c690614bb004 -r 5c55e9383b06 lang/go19/Makefile
--- a/lang/go19/Makefile        Fri May 01 13:52:04 2020 +0000
+++ b/lang/go19/Makefile        Fri May 01 14:09:14 2020 +0000
@@ -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/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"



Home | Main Index | Thread Index | Old Index