[atlas] 01/02: d/rules: on Ubuntu s390x set ARCHS to z12.

[Sébastien Villemot]

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

sebastien pushed a commit to branch master
in repository atlas.

commit 8abfe0e0f63642a2188be2f1d922c5f38d09a6d2
Author: Dimitri John Ledkov <xnox at ubuntu.com>
Date:   Mon Aug 8 17:48:39 2016 +0100

    d/rules: on Ubuntu s390x set ARCHS to z12.
---
 debian/rules | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index 8c33710..591a945 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,11 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 
+ifeq (yes,$(shell dpkg-vendor --derives-from Ubuntu && echo yes))
+UBUNTU:=yes
+endif
+
+
 # NB: the following strings and numbers come from xprint_enums (compilable from the build
 # directory with "make xprint_enums); they can change across releases
 #
@@ -10,7 +15,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 # - 1 means no instruction set extension
 # - 768 means SSE1+SSE2 (always available on amd64)
 ifeq ($(DEB_HOST_ARCH),s390x)
-ARCHS=base_IBMz9_1
+ARCHS=$(if $(UBUNTU),base_IBMz12_1,base_IBMz9_1)
 else ifeq ($(DEB_HOST_ARCH_CPU),ppc64el)
 ARCHS=base_POWER8_1
 else ifeq ($(DEB_HOST_ARCH_CPU),i386)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/atlas.git