[Pkg-golang-commits] [golang] 01/01: Add more supported arches to "debian/rules" code for detecting appropriate GOARCH/GOHOSTARCH values; thanks mwhudson and tpot! (Closes: #799907)

[Tianon Gravi]

This is an automated email from the git hooks/post-receive script.

tianon pushed a commit to branch debian-experimental
in repository golang.

commit 392d999bafb10cbd8cf8dda698a61fe2da5c6131
Author: Tianon Gravi <tianon at debian.org>
Date:   Thu Sep 24 23:21:55 2015 -0700

    Add more supported arches to "debian/rules" code for detecting appropriate GOARCH/GOHOSTARCH values; thanks mwhudson and tpot! (Closes: #799907)
---
 debian/changelog |  3 +++
 debian/rules     | 25 +++++++++++++++++--------
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 53fb17f..c36eecf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,9 @@ golang (2:1.5.1-1~exp1) UNRELEASED; urgency=low
       GOROOT, and thus the golang-go-GOHOST-GOARCH packages are removed.
   * Sync debian/copyright with the Ubuntu delta. (thanks doko!)
   * Remove patches that no longer apply.
+  * Add more supported arches to "debian/rules" code for detecting
+    appropriate GOARCH/GOHOSTARCH values; thanks mwhudson and tpot!
+    (Closes: #799907)
 
  -- Tianon Gravi <tianon at debian.org>  Wed, 22 Jul 2015 21:55:56 -0700
 
diff --git a/debian/rules b/debian/rules
index 31b1b8f..c5a0d8e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -123,29 +123,38 @@ else ifeq ($(DEB_BUILD_ARCH_CPU), amd64)
     GOHOSTARCH := amd64
 else ifeq ($(DEB_BUILD_ARCH_CPU), arm)
     GOHOSTARCH := arm
-else ifeq ($(DEB_BUILD_ARCH_CPU), armhf)
-    GOHOSTARCH := arm
+else ifeq ($(DEB_BUILD_ARCH_CPU), arm64)
+    GOHOSTARCH := arm64
+else ifeq ($(DEB_BUILD_ARCH_CPU), ppc64)
+    GOHOSTARCH := ppc64
+else ifeq ($(DEB_BUILD_ARCH_CPU), ppc64el)
+    GOHOSTARCH := ppc64le
 else
-    $(error unrecognized build host instruction set $(DEB_HOST_ARCH_CPU)!)
+    $(error unrecognized build host instruction set $(DEB_BUILD_ARCH_CPU)!)
 endif
 
 ifeq ($(DEB_HOST_ARCH_CPU), i386)
     GOARCH := 386
-    GOPREFIX := 8
 else ifeq ($(DEB_HOST_ARCH_CPU), amd64)
     GOARCH := amd64
-    GOPREFIX := 6
 else ifeq ($(DEB_HOST_ARCH_CPU), arm)
+    RUN_TEST := false
     GOARCH := arm
-    GOPREFIX := 5
+# set GOARM to lowest-common-denominator for each arch
+# see notes about GO386 above for details
 ifeq ($(DEB_HOST_ARCH), armel)
-    RUN_TEST := false
     GOARM := 5
 else ifeq ($(DEB_HOST_ARCH), armhf)
     GOARM := 6
 else
-    $(error unrecognized arm architecture $(DEB_HOST_ARCH)!)
+    $(error unrecognized arm architecture $(DEB_HOST_ARCH) ($(shell uname -m))!)
 endif
+else ifeq ($(DEB_HOST_ARCH_CPU), arm64)
+    GOARCH := arm64
+else ifeq ($(DEB_HOST_ARCH_CPU), ppc64)
+    GOARCH := ppc64
+else ifeq ($(DEB_HOST_ARCH_CPU), ppc64el)
+    GOARCH := ppc64le
 else
     $(error unrecognized instruction set $(DEB_HOST_ARCH_CPU)!)
 endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-golang/golang.git