[atlas] 02/03: Revert "d/rules: on Ubuntu s390x set ARCHS to z12."
Sébastien Villemot
sebastien at debian.org
Sat Aug 6 18:35:06 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastien pushed a commit to branch master
in repository atlas.
commit 5acdfc3c0f925afdf8b58a80ac3b439ef5be820a
Author: Sébastien Villemot <sebastien at debian.org>
Date: Sat Aug 6 20:26:52 2016 +0200
Revert "d/rules: on Ubuntu s390x set ARCHS to z12."
This reverts commit e7372d2f3dd506acaccbb568d440abb9ca7e99af.
---
debian/rules | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/debian/rules b/debian/rules
index 591a945..8c33710 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,11 +3,6 @@
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
#
@@ -15,7 +10,7 @@ endif
# - 1 means no instruction set extension
# - 768 means SSE1+SSE2 (always available on amd64)
ifeq ($(DEB_HOST_ARCH),s390x)
-ARCHS=$(if $(UBUNTU),base_IBMz12_1,base_IBMz9_1)
+ARCHS=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
More information about the debian-science-commits
mailing list