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

[Sébastien Villemot]

The following commit has been merged in the master branch:
commit ee68a0e338817efda1f3ce645b23d9cc14ff81e9
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Sat Jun 8 17:39:56 2013 +0200

    The generic package is now built without multi-threading
    
    because otherwise the package fails to build on some single-processor machines.
    As a side effect, the build of the custom package gracefully handles
    non-threaded builds.

diff --git a/debian/changelog b/debian/changelog
index 1f28669..27a881b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,10 @@ atlas (3.10.1-1) UNRELEASED; urgency=low
       ATLAS uses asm constructs too recent for the platform (armel is only v4t)
     + debian/rules: on armhf, define the ATL_ARM_HARDFP flag; otherwise the asm
       constructs use the soft-float ABI for passing floating points
+  * The generic package is now built without multi-threading, because otherwise
+    the package fails to build on some single-processor machines. As a side
+    effect, the build of the custom package gracefully handles non-threaded
+    builds. (Closes: #602524)
   * Add libblas.a as slave in the libblas.so alternative (Closes: #701921)
   * Add symlinks for lib{f77blas,atlas}.a in /usr/lib (Closes: #666203)
   * Modify shlibs file of libatlas3-base, such that packages using
diff --git a/debian/libatlas-test.install b/debian/libatlas-test.install
index 252e929..5b3e91a 100644
--- a/debian/libatlas-test.install
+++ b/debian/libatlas-test.install
@@ -1,5 +1,4 @@
 build/atlas-base/bin/*tst usr/lib/libatlas-test
-build/atlas-base/bin/*tst_pt usr/lib/libatlas-test
 build/atlas-base/tune/blas/level1/x* usr/lib/libatlas-test
 build/atlas-base/tune/blas/gemv/x* usr/lib/libatlas-test
 build/atlas-base/tune/blas/gemm/x* usr/lib/libatlas-test
diff --git a/debian/patches/static_full_blas_lapack.diff b/debian/patches/static_full_blas_lapack.diff
index 3274cfa..c33f518 100644
--- a/debian/patches/static_full_blas_lapack.diff
+++ b/debian/patches/static_full_blas_lapack.diff
@@ -1,4 +1,6 @@
 Description: Create full featured static libblas.a and liblapack.a
+ The resulting BLAS library will use the threaded flavour if the build has been
+ configured to create them. Otherwise, the serial library is used.
 Author: David Evans
 Last-Update: 2013-06-05
 ---
@@ -53,25 +55,36 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  	- cp $(LIBdir)/libptcblas.a $(INSTdir)/.
 --- a/makes/Make.lib
 +++ b/makes/Make.lib
-@@ -175,6 +175,25 @@
+@@ -175,6 +175,36 @@
             LIBS="$(LIBS)" LIBINSTdir="$(LIBINSTdir)" ; \
          fi
  
 +
 +# Build full netlib blas/lapack libraries:
-+atlas/libblas.a: libatlas.a libptf77blas.a libptcblas.a
++atlas/libblas.a: libatlas.a
 +	mkdir tmp
-+	(cd tmp && ar x ../libatlas.a);
-+	(cd tmp && ar x ../libptf77blas.a);
-+	(cd tmp && ar x ../libptcblas.a);
++	cd tmp && \
++		ar x ../libatlas.a && \
++		if test -f ../libptf77blas.a -a -f ../libptcblas.a; then \
++			ar x ../libptf77blas.a && \
++			ar x ../libptcblas.a; \
++		else \
++			ar x ../libf77blas.a && \
++			ar x ../libcblas.a; \
++		fi
 +	ar r $@ tmp/*.o
 +	rm -rf tmp
 +
 +atlas/liblapack.a: liblapack_atlas.a libatlas.a
 +	mkdir tmp
-+	(cd tmp && ar x /usr/lib/liblapack_pic.a);
-+	(cd tmp && ar x ../liblapack_atlas.a);
-+	(cd tmp && ar x ../libptcblas.a);
++	cd tmp && \
++		ar x /usr/lib/liblapack_pic.a && \
++		ar x ../liblapack_atlas.a && \
++		if test -f ../libptcblas.a; then \
++			ar x ../libptcblas.a; \
++		else \
++			ar x ../libcblas.a; \
++		fi
 +	ar r $@ tmp/*.o
 +	rm -rf tmp
 +
diff --git a/debian/rules b/debian/rules
index 95ea813..ca1927c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -113,7 +113,7 @@ configure-stamp:
 		mkdir -p build/$$targetName;					\
 		cd build/$$targetName; 							\
 		if test "$(ARCHS)" != "base__"; then 		\
-		../../configure $(COMMON_CONFIG_PARAMS) -t 2 -Ss ADdir ../../../debian/archdefs/$(DEB_HOST_ARCH_CPU);	\
+		../../configure $(COMMON_CONFIG_PARAMS) -t 0 -Ss ADdir ../../../debian/archdefs/$(DEB_HOST_ARCH_CPU);	\
 		else						\
 		../../configure $(COMMON_CONFIG_PARAMS);	\
 		fi;						\
@@ -132,7 +132,7 @@ build-stamp:
 		cd build/$$targetName;									\
 		$(MAKE) build;											\
 		$(MAKE) check;											\
-		$(MAKE) ptcheck;										\
+		test -f build/$$targetName/lib/libptcblas.a && $(MAKE) ptcheck;										\
 		echo "==============================================";	\
 		cd ../../../
 		# Do not build the help when building the custom package

-- 
ATLAS packaging for Debian