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

[Sébastien Villemot]

The following commit has been merged in the master branch:
commit 97603e698353d48a9fb8080bf47ab0bf8bfa9f3c
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Wed Jun 5 17:20:47 2013 +0200

    Various fixes to debian/rules
    
    - amd64 is 64-bit
    - for amd64 targets, use ARCH=x86SSE2 and ISA=384 (SSE1+SSE2)
    - *-stamp targets are not .PHONY
    - DEB_*_ARCH variables are already provided by cdbs

diff --git a/debian/rules b/debian/rules
index ce3989d..751a38d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,37 +3,32 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 
-DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU)
-DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-
-# Pointer bitwidth (default value)
-MODE_BITWIDTH = 32
-
 # First number in ARCHS:
 # - 0 means Unknown CPU. Leave Atlas find out
 # - 1 means POWER3, most generic PowerPC (see #680096)
 # - 11 means artificial architecture called x86x87, providing you with portable (but slow!) architectural defaults.
-# See http://math-atlas.sourceforge.net/atlas_install/node28.html
+#   See http://math-atlas.sourceforge.net/atlas_install/node28.html
+# - 13 means generic libraries for P4 and later, with SSE2
+#   See: http://math-atlas.sourceforge.net/atlas_install/node30.html
 # Second number in ARCHS:
 # - 1 means no instruction set extension
-X86_ARCHS := i386 kfreebsd-amd64 kfreebsd-i386 hurd-i386
+# - 384 means SSE1+SSE2
 PPC_ARCHS := powerpc powerpcspe ppc64
-ifneq (,$(findstring $(DEB_HOST_ARCH),$(X86_ARCHS)))
+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)))
 ARCHS=base_1_1
 else
 ARCHS=base_0_1
 endif
 
-DEB_SHLIBDEPS_INCLUDE_libatlas3-base := $(CURDIR)/debian/libatlas3-base/usr/lib/atlas-base/:$(CURDIR)/debian/libatlas3-base/usr/lib/atlas-base/atlas/
+# Pointer bitwidth
+MODE_BITWIDTH = 32
 
-# # see what do we do with the amd64 / intel 64
 ifeq ($(DEB_HOST_ARCH_CPU),amd64)
-# See: http://math-atlas.sourceforge.net/atlas_install/node30.html
-# # 64 bits
-ARCHS=base_13_192
-MODE_BITWIDTH = 32
+MODE_BITWIDTH = 64
 endif
 
 ifeq ($(DEB_HOST_ARCH_CPU),ia64)
@@ -45,6 +40,8 @@ ifeq ($(DEB_HOST_ARCH_CPU),ppc64)
 MODE_BITWIDTH = 64
 endif
 
+DEB_SHLIBDEPS_INCLUDE_libatlas3-base := $(CURDIR)/debian/libatlas3-base/usr/lib/atlas-base/:$(CURDIR)/debian/libatlas3-base/usr/lib/atlas-base/atlas/
+
 GFORTRAN_LIB_PATH=`$(CC) -print-search-dirs|grep ^install:|awk '{print $$2}'`
 
 COMMON_CONFIG_PARAMS := --prefix="$(DEB_DESTDIR)" 	\
@@ -61,10 +58,9 @@ COMMON_CONFIG_PARAMS := --prefix="$(DEB_DESTDIR)" 	\
 	-A $$atlasArch									\
 	-V $$atlasISA 									\
 	-v 2
-# ../../configure --cc="cc" --cflags="-g -O2" -D c -DWALL -b 64 -Fa alg '-Wa,--noexecstack -fPIC' -Ss flapack /usr/lib/liblapack_pic.a -Ss f77lib "-L/usr/lib/gcc/x86_64-linux-gnu/4.4.5/ -lgfortran -lgcc_s -lpthread" -Ss pmake '/usr/bin/make -j 1' -A 0 -V 1 -v 2 -Si cputhrchk 0 -t 2
-custom: custom-stamp
 
 # Build a custom package optimized for the current arch
+custom: custom-stamp
 custom-stamp:
 		rm -f configure-stamp
 
@@ -221,8 +217,7 @@ binary-arch: build install
 		dh_fixperms -a
 		dh_installdeb -a
 
-.PHONY: build build-indep build-indep-stamp build-arch build-arch-stamp check clean binary binary-indep binary-arch configure-stamp configure custom custom-stamp
-
+.PHONY: build build-indep build-arch clean binary binary-indep binary-arch configure custom
 
 get-orig-source:
 	-uscan --upstream-version 0

-- 
ATLAS packaging for Debian