[Pkg-golang-commits] [golang] 06/15: - Updates for s390x support.

[Michael Hudson-Doyle]

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

mwhudson-guest pushed a commit to branch ubuntu-trusty-golang-1.6
in repository golang.

commit c6116e4d05b6ac6b62371c2ea08f77e45402a175
Author: Michael Hudson-Doyle <michael.hudson at canonical.com>
Date:   Fri Feb 12 10:32:22 2016 +1300

        - Updates for s390x support.
---
 debian/control          | 2 +-
 debian/helpers/goenv.sh | 2 +-
 debian/rules            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index d77c665..d031c0f 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,7 @@ Depends: golang-src (>= ${source:Version}),
          ${misc:Depends},
          ${perl:Depends},
          ${shlibs:Depends},
-         gccgo [!armel !armhf !amd64 !i386 !arm64 !ppc64 !ppc64el]
+         gccgo [!armel !armhf !amd64 !i386 !arm64 !ppc64 !ppc64el !s390x]
 Breaks: golang-go-darwin-386,
         golang-go-darwin-amd64,
         golang-go-freebsd-386,
diff --git a/debian/helpers/goenv.sh b/debian/helpers/goenv.sh
index 28146ff..ee0b737 100755
--- a/debian/helpers/goenv.sh
+++ b/debian/helpers/goenv.sh
@@ -11,7 +11,7 @@ __goos__deb_arch_os() {
 
 __goarch__deb_arch_cpu() {
 	case "$1" in
-		amd64|arm|arm64|ppc64) echo "$1" ;;
+		amd64|arm|arm64|ppc64|s390x) echo "$1" ;;
 		i386) echo 386 ;;
 		ppc64el) echo ppc64le ;;
 		mips64el) echo mips64le ;;
diff --git a/debian/rules b/debian/rules
index 19e18dc..6acb71e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,7 @@ ifneq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 endif
 
 DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
-golang_archs = armel armhf amd64 i386 arm64 ppc64 ppc64el
+golang_archs = armel armhf amd64 i386 arm64 ppc64 ppc64el s390x
 IS_GOLANG_ARCH := true
 ifeq (,$(filter $(DEB_HOST_ARCH),$(golang_archs)))
 	IS_GOLANG_ARCH := false

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