[Pkg-golang-commits] [golang] 01/01: Add "s390x" to Architectures (skip tests on s390x -- they fail in cgo-related ways)

[Tianon Gravi]

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

tianon pushed a commit to branch golang-1.7
in repository golang.

commit b546fb514b8f15bf53a43b872bc6dbf90828e208
Author: Tianon Gravi <tianon at debian.org>
Date:   Wed Aug 17 12:29:40 2016 -0700

    Add "s390x" to Architectures (skip tests on s390x -- they fail in cgo-related ways)
---
 debian/changelog        | 7 +++++++
 debian/control          | 4 ++--
 debian/control.in       | 4 ++--
 debian/helpers/goenv.sh | 2 +-
 debian/rules            | 2 +-
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8ab31e5..a8b8606 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+golang-1.7 (1.7-3) UNRELEASED; urgency=medium
+
+  * Add "s390x" to Architectures
+    (skip tests on s390x -- they fail in cgo-related ways)
+
+ -- Tianon Gravi <tianon at debian.org>  Tue, 16 Aug 2016 07:35:03 -0700
+
 golang-1.7 (1.7-2) unstable; urgency=medium
 
   * Disable tests on armel.
diff --git a/debian/control b/debian/control
index 0e64f4c..ee2e087 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,7 @@ Standards-Version: 3.9.8
 Homepage: https://golang.org
 
 Package: golang-1.7-go
-Architecture: amd64 arm64 armel armhf i386 ppc64 ppc64el
+Architecture: amd64 arm64 armel armhf i386 ppc64 ppc64el s390x
 Depends: golang-1.7-src (>= ${source:Version}),
          ${misc:Depends},
          ${perl:Depends},
@@ -43,7 +43,7 @@ Description: Go programming language compiler, linker, compiled stdlib
  pre-compile the standard library inside GOROOT for cross-compilation to work.
 
 Package: golang-1.7-src
-Architecture: amd64 arm64 armel armhf i386 ppc64 ppc64el
+Architecture: amd64 arm64 armel armhf i386 ppc64 ppc64el s390x
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Go programming language - source files
  The Go programming language is an open source project to make programmers more
diff --git a/debian/control.in b/debian/control.in
index 0d927e8..a648624 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -15,7 +15,7 @@ Standards-Version: 3.9.8
 Homepage: https://golang.org
 
 Package: golang-X.Y-go
-Architecture: amd64 arm64 armel armhf i386 ppc64 ppc64el
+Architecture: amd64 arm64 armel armhf i386 ppc64 ppc64el s390x
 Depends: golang-X.Y-src (>= ${source:Version}),
          ${misc:Depends},
          ${perl:Depends},
@@ -39,7 +39,7 @@ Description: Go programming language compiler, linker, compiled stdlib
  pre-compile the standard library inside GOROOT for cross-compilation to work.
 
 Package: golang-X.Y-src
-Architecture: amd64 arm64 armel armhf i386 ppc64 ppc64el
+Architecture: amd64 arm64 armel armhf i386 ppc64 ppc64el s390x
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Go programming language - source files
  The Go programming language is an open source project to make programmers more
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 754dfcb..7fcb0f6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@ export GOROOT_FINAL := /usr/lib/go-$(GOVER)
 
 DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH 2>/dev/null)
 RUN_TESTS := true
-ifneq (,$(filter armel ppc64,$(DEB_HOST_ARCH)))
+ifneq (,$(filter armel ppc64 s390x,$(DEB_HOST_ARCH)))
 	RUN_TESTS := false
 endif
 ifneq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))

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