Mon May 1 09:55:46 2017 UTC ()
Pullup ticket #5392 - requested by sevan
lang/go: build fix

Revisions pulled up:
- lang/go/version.mk                                            1.25

---
   Module Name:    pkgsrc
   Committed By:   maya
   Date:           Sun Apr 30 23:02:09 UTC 2017

   Modified Files:
           pkgsrc/lang/go: version.mk

   Log Message:
   go: match even more ARM with wildcards

   part 1 of PR pkg/52178 from aikchar


(bsiegert)
diff -r1.23 -r1.23.2.1 pkgsrc/lang/go/version.mk
cvs diff -r1.23 -r1.23.2.1 pkgsrc/lang/go/version.mk (expand / switch to unified diff)

--- pkgsrc/lang/go/version.mk 2017/03/15 19:38:09 1.23
+++ pkgsrc/lang/go/version.mk 2017/05/01 09:55:46 1.23.2.1
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1# $NetBSD: version.mk,v 1.23 2017/03/15 19:38:09 bsiegert Exp $ 1# $NetBSD: version.mk,v 1.23.2.1 2017/05/01 09:55:46 bsiegert Exp $
2 2
3.include "../../mk/bsd.prefs.mk" 3.include "../../mk/bsd.prefs.mk"
4 4
5GO_VERSION= 1.8 5GO_VERSION= 1.8
6GO14_VERSION= 1.4.3 6GO14_VERSION= 1.4.3
7 7
8ONLY_FOR_PLATFORM= *-*-i386 *-*-x86_64 *-*-*arm* 8ONLY_FOR_PLATFORM= *-*-i386 *-*-x86_64 *-*-*arm*
9NOT_FOR_PLATFORM= SunOS-*-i386 9NOT_FOR_PLATFORM= SunOS-*-i386
10.if ${MACHINE_ARCH} == "i386" 10.if ${MACHINE_ARCH} == "i386"
11GOARCH= 386 11GOARCH= 386
12GOCHAR= 8 12GOCHAR= 8
13.elif ${MACHINE_ARCH} == "x86_64" 13.elif ${MACHINE_ARCH} == "x86_64"
14GOARCH= amd64 14GOARCH= amd64
15GOCHAR= 6 15GOCHAR= 6
16.elif !empty(MACHINE_ARCH:M*arm) 16.elif !empty(MACHINE_ARCH:M*arm*)
17GOARCH= arm 17GOARCH= arm
18GOCHAR= 5 18GOCHAR= 5
19.endif 19.endif
20PLIST_SUBST+= GO_PLATFORM=${LOWER_OPSYS:Q}_${GOARCH:Q} GOARCH=${GOARCH:Q} 20PLIST_SUBST+= GO_PLATFORM=${LOWER_OPSYS:Q}_${GOARCH:Q} GOARCH=${GOARCH:Q}
21PLIST_SUBST+= GOCHAR=${GOCHAR:Q} 21PLIST_SUBST+= GOCHAR=${GOCHAR:Q}