Fri May 1 16:39:59 2020 UTC ()
go/version.mk: now supports aarch64


(tnn)
diff -r1.89 -r1.90 pkgsrc/lang/go/version.mk
cvs diff -r1.89 -r1.90 pkgsrc/lang/go/version.mk (expand / switch to unified diff)

--- pkgsrc/lang/go/version.mk 2020/04/12 11:09:03 1.89
+++ pkgsrc/lang/go/version.mk 2020/05/01 16:39:59 1.90
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: version.mk,v 1.89 2020/04/12 11:09:03 bsiegert Exp $ 1# $NetBSD: version.mk,v 1.90 2020/05/01 16:39:59 tnn Exp $
2 2
3# 3#
4# If bsd.prefs.mk is included before go-package.mk in a package, then this 4# If bsd.prefs.mk is included before go-package.mk in a package, then this
5# file must be included directly in the package prior to bsd.prefs.mk. 5# file must be included directly in the package prior to bsd.prefs.mk.
6# 6#
7.include "go-vars.mk" 7.include "go-vars.mk"
8 8
9GO114_VERSION= 1.14.2 9GO114_VERSION= 1.14.2
10GO113_VERSION= 1.13.10 10GO113_VERSION= 1.13.10
11GO110_VERSION= 1.10.8 11GO110_VERSION= 1.10.8
12GO19_VERSION= 1.9.7 12GO19_VERSION= 1.9.7
13GO14_VERSION= 1.4.3 13GO14_VERSION= 1.4.3
14 14
@@ -26,37 +26,42 @@ GO_VERSION_DEFAULT?= 110 @@ -26,37 +26,42 @@ GO_VERSION_DEFAULT?= 110
26GO_VERSION_DEFAULT?= 114 26GO_VERSION_DEFAULT?= 114
27.endif 27.endif
28 28
29.if !empty(GO_VERSION_DEFAULT) 29.if !empty(GO_VERSION_DEFAULT)
30GOVERSSUFFIX= ${GO_VERSION_DEFAULT} 30GOVERSSUFFIX= ${GO_VERSION_DEFAULT}
31.endif 31.endif
32 32
33# How to find the Go tool 33# How to find the Go tool
34GO= ${PREFIX}/go${GOVERSSUFFIX}/bin/go 34GO= ${PREFIX}/go${GOVERSSUFFIX}/bin/go
35 35
36# Build dependency for Go 36# Build dependency for Go
37GO_PACKAGE_DEP= go${GOVERSSUFFIX}-${GO${GOVERSSUFFIX}_VERSION}*:../../lang/go${GOVERSSUFFIX} 37GO_PACKAGE_DEP= go${GOVERSSUFFIX}-${GO${GOVERSSUFFIX}_VERSION}*:../../lang/go${GOVERSSUFFIX}
38 38
39ONLY_FOR_PLATFORM= *-*-i386 *-*-x86_64 *-*-earmv[67]hf 39ONLY_FOR_PLATFORM= *-*-i386 *-*-x86_64 *-*-earmv[67]hf *-*-aarch64
40NOT_FOR_PLATFORM= SunOS-*-i386 40NOT_FOR_PLATFORM= SunOS-*-i386
41.if ${MACHINE_ARCH} == "i386" 41.if ${MACHINE_ARCH} == "i386"
42GOARCH= 386 42GOARCH= 386
43GOCHAR= 8 43GOCHAR= 8
44.elif ${MACHINE_ARCH} == "x86_64" 44.elif ${MACHINE_ARCH} == "x86_64"
45GOARCH= amd64 45GOARCH= amd64
46GOCHAR= 6 46GOCHAR= 6
47.elif ${MACHINE_ARCH} == "earmv6hf" || ${MACHINE_ARCH} == "earmv7hf" 47.elif ${MACHINE_ARCH} == "earmv6hf" || ${MACHINE_ARCH} == "earmv7hf"
48GOARCH= arm 48GOARCH= arm
49GOCHAR= 5 49GOCHAR= 5
 50.elif ${MACHINE_ARCH} == "aarch64"
 51GOARCH= arm64
 52GOOPT= GOARM=7
 53# GOHOSTARCH is being misdetected as arm on NetBSD. Unclear why.
 54GOOPT+= GOHOSTARCH=arm64
50.endif 55.endif
51.if ${MACHINE_ARCH} == "earmv6hf" 56.if ${MACHINE_ARCH} == "earmv6hf"
52GOOPT= GOARM=6 57GOOPT= GOARM=6
53.elif ${MACHINE_ARCH} == "earmv7hf" 58.elif ${MACHINE_ARCH} == "earmv7hf"
54GOOPT= GOARM=7 59GOOPT= GOARM=7
55.endif 60.endif
56GO_PLATFORM= ${LOWER_OPSYS}_${GOARCH} 61GO_PLATFORM= ${LOWER_OPSYS}_${GOARCH}
57PLIST_SUBST+= GO_PLATFORM=${GO_PLATFORM:Q} GOARCH=${GOARCH:Q} 62PLIST_SUBST+= GO_PLATFORM=${GO_PLATFORM:Q} GOARCH=${GOARCH:Q}
58PLIST_SUBST+= GOCHAR=${GOCHAR:Q} 63PLIST_SUBST+= GOCHAR=${GOCHAR:Q}
59 64
60PRINT_PLIST_AWK+= { sub("/${GO_PLATFORM}/", "/$${GO_PLATFORM}/") } 65PRINT_PLIST_AWK+= { sub("/${GO_PLATFORM}/", "/$${GO_PLATFORM}/") }
61 66
62TOOLS_CREATE+= go 67TOOLS_CREATE+= go