[SCM] ATLAS packaging for Debian branch, master, updated. upstream/3.8.4-29-gdc4f105

Sat Jun 8 07:55:08 UTC 2013

The following commit has been merged in the master branch:
commit dc4f105643dcf153a1635c76f842b2ed1c79ebf1
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Sat Jun 8 09:54:48 2013 +0200

    Add archdefs for armhf, ia64, mipsel, powerpc, s390, s390x, sparc
    
    Still missing: armel, mips

diff --git a/debian/README.source b/debian/README.source
index 3a84fcf..11b6cf6 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -25,18 +25,22 @@ getting the package compiled on all arches.
 
 In order to overcome this problem, the generic ATLAS package uses pre-computed
 timings (called architectural defaults in the ATLAS jargon). These are located
-under debian/archdefs/$(DEB_HOST_ARCH_CPU).
+under debian/archdefs/$(DEB_HOST_ARCH_CPU). The name of the tarballs
+corresponds to the architecture detected by ATLAS (variable ARCH in
+build/atlas-base/Make.inc).
 
 The procedure for creating these architectural defaults on a given platform is
 the following:
 
  debuild -us -uc -B    (will be very long, because timings will be computed)
  cd build/ARCHS
- make ArchNew          (will create an $(ARCH) subdirectory)
- tar caf $(ARCH).tar.bz2 $(ARCH)
- mv $(ARCH).tar.bz2 ../../debian/archdefs/$(DEB_HOST_ARCH_CPU)
+ make ArchNew          (will create an $(ATLAS_ARCH) subdirectory)
+ tar caf $(ATLAS_ARCH).tar.bz2 $(ATLAS_ARCH)
+ mkdir -p ../../debian/archdefs/$(DEB_HOST_ARCH_CPU)/
+ mv $(ATLAS_ARCH).tar.bz2 ../../debian/archdefs/$(DEB_HOST_ARCH_CPU)/
+ echo debian/archdefs/$(DEB_HOST_ARCH_CPU)/$(ATLAS_ARCH).tar.bz2 >> ../../debian/source/include-binaries
 
 [1] http://math-atlas.sourceforge.net/errata.html#tol
 
- -- Sébastien Villemot <sebastien at debian.org>, Wed,  5 Jun 2013 17:28:10 +0200
+ -- Sébastien Villemot <sebastien at debian.org>, Thu,  6 Jun 2013 11:41:28 +0200
 
diff --git a/CONFIG/ARCHS/ARMv732.tar.bz2 b/debian/archdefs/arm/ARMv732.tar.bz2
similarity index 100%
copy from CONFIG/ARCHS/ARMv732.tar.bz2
copy to debian/archdefs/arm/ARMv732.tar.bz2
diff --git a/debian/archdefs/ia64/IA64Itan64.tar.bz2 b/debian/archdefs/ia64/IA64Itan64.tar.bz2
new file mode 100644
index 0000000..21d191c
Binary files /dev/null and b/debian/archdefs/ia64/IA64Itan64.tar.bz2 differ
diff --git a/debian/archdefs/mipsel/UNKNOWN32.tar.bz2 b/debian/archdefs/mipsel/UNKNOWN32.tar.bz2
new file mode 100644
index 0000000..abd36a7
Binary files /dev/null and b/debian/archdefs/mipsel/UNKNOWN32.tar.bz2 differ
diff --git a/debian/archdefs/powerpc/POWER332.tar.bz2 b/debian/archdefs/powerpc/POWER332.tar.bz2
new file mode 100644
index 0000000..6505f42
Binary files /dev/null and b/debian/archdefs/powerpc/POWER332.tar.bz2 differ
diff --git a/debian/archdefs/s390/IBMz932.tar.bz2 b/debian/archdefs/s390/IBMz932.tar.bz2
new file mode 100644
index 0000000..7863bd4
Binary files /dev/null and b/debian/archdefs/s390/IBMz932.tar.bz2 differ
diff --git a/debian/archdefs/s390x/IBMz964.tar.bz2 b/debian/archdefs/s390x/IBMz964.tar.bz2
new file mode 100644
index 0000000..6136ce2
Binary files /dev/null and b/debian/archdefs/s390x/IBMz964.tar.bz2 differ
diff --git a/debian/archdefs/sparc/USI32.tar.bz2 b/debian/archdefs/sparc/USI32.tar.bz2
new file mode 100644
index 0000000..f4f72c0
Binary files /dev/null and b/debian/archdefs/sparc/USI32.tar.bz2 differ
diff --git a/debian/rules b/debian/rules
index 7caf659..95ea813 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,22 +3,36 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 
+# NB: the following numbers come from xprint_enums (compilable from the build
+# directory with "make xprint_enums); they can change across major releases
+#
 # First number in ARCHS:
-# - 0 means Unknown CPU. Leave Atlas find out
-# - 1 means POWER3, most generic PowerPC (see #680096), howevever not suitable for powerpcspe (#701068)
-# - 11 means artificial architecture called x86x87, providing you with portable (but slow!) architectural defaults.
+# - 0 means Unknown CPU: leave ATLAS find out; used for archs where a more specific choice is not available
+# - 8 means IBMz9: for s390 and s390x
+# - 1 means POWER3: most generic PowerPC (#680096); cannot be used on powerpcspe (#701068)
+# - 11 means artificial architecture called x86x87, providing you with portable (but slow!) architectural defaults: for *i386
 #   See http://math-atlas.sourceforge.net/atlas_install/node28.html
-# - 13 means generic libraries for P4 and later, with SSE2
+# - 13 means generic libraries for P4 and later, with SSE2: for *amd64
 #   See: http://math-atlas.sourceforge.net/atlas_install/node30.html
+# - 36 means IA64Itan: for ia64
+# - 38 means UltraSparc I (USI): for sparc
+# - 46 means ARMv7: for armhf (but not for armel, which is ARM >= v4)
 # Second number in ARCHS:
 # - 1 means no instruction set extension
-# - 384 means SSE1+SSE2
-PPC_ARCHS := powerpc ppc64
-ifeq ($(DEB_HOST_ARCH_CPU),i386)
+# - 384 means SSE1+SSE2 (always available on amd64)
+ifneq (,$(findstring $(DEB_HOST_ARCH),s390 s390x))
+ARCHS=base_8_1
+else ifeq ($(DEB_HOST_ARCH_CPU),i386)
 ARCHS=base_11_1
 else ifeq ($(DEB_HOST_ARCH_CPU),amd64)
 ARCHS=base_13_384
-else ifneq (,$(findstring $(DEB_HOST_ARCH),$(PPC_ARCHS)))
+else ifeq ($(DEB_HOST_ARCH),ia64)
+ARCHS=base_36_1
+else ifeq ($(DEB_HOST_ARCH),sparc)
+ARCHS=base_38_1
+else ifeq ($(DEB_HOST_ARCH),armhf)
+ARCHS=base_46_1
+else ifneq (,$(findstring $(DEB_HOST_ARCH),powerpc ppc64))
 ARCHS=base_1_1
 else
 ARCHS=base_0_1
diff --git a/debian/source/include-binaries b/debian/source/include-binaries
index bf790ba..e0941ad 100644
--- a/debian/source/include-binaries
+++ b/debian/source/include-binaries
@@ -1,2 +1,9 @@
-debian/archdefs/i386/x86x8732.tar.bz2
 debian/archdefs/amd64/x86SSE264SSE2.tar.bz2
+debian/archdefs/arm/ARMv732.tar.bz2
+debian/archdefs/i386/x86x8732.tar.bz2
+debian/archdefs/ia64/IA64Itan64.tar.bz2
+debian/archdefs/mipsel/UNKNOWN32.tar.bz2
+debian/archdefs/powerpc/POWER332.tar.bz2
+debian/archdefs/s390/IBMz932.tar.bz2
+debian/archdefs/s390x/IBMz964.tar.bz2
+debian/archdefs/sparc/USI32.tar.bz2

-- 
ATLAS packaging for Debian

