[SCM] ATLAS packaging for Debian branch, master, updated. debian/3.10.1-1-1-g939208d

[Sébastien Villemot]

The following commit has been merged in the master branch:
commit 939208d1c22e95477e55ad97dcead2f045e1bd27
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Wed Jun 12 10:10:42 2013 +0200

    Allow the generic package to build on machines with CPU throttling enabled
    
    Otherwise the package FTBFS on some buildds (e.g. biber).
    Implementation is done by reactivating the "-Si cputhrchk 0" flag
    (cpu-throtthling-check.diff), and using it in debian/rules.

diff --git a/debian/changelog b/debian/changelog
index 9005f13..4ca7804 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+atlas (3.10.1-2) UNRELEASED; urgency=low
+
+  * Allow the generic package to build on machines with CPU throttling
+    enabled. Otherwise the package FTBFS on some buildds (e.g. biber).
+    Implementation is done by reactivating the "-Si cputhrchk 0" flag
+    (cpu-throtthling-check.diff), and using it in debian/rules.
+
+ -- Sébastien Villemot <sebastien at debian.org>  Wed, 12 Jun 2013 10:02:09 +0200
+
 atlas (3.10.1-1) experimental; urgency=low
 
   [ Sylvestre Ledru ]
diff --git a/debian/patches/cpu-throttling-check.diff b/debian/patches/cpu-throttling-check.diff
new file mode 100644
index 0000000..20b9df2
--- /dev/null
+++ b/debian/patches/cpu-throttling-check.diff
@@ -0,0 +1,30 @@
+Description: Reenable the configuration flag for disable CPU throttling check
+ For the generic package, we need the ability to compile on machines with CPU
+ throttling enabled (since some buildds have that feature).
+Author: Sébastien Villemot <sebastien at debian.org>
+Forwarded: not-needed
+Last-Update: 2013-06-11
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/CONFIG/src/config.c
++++ b/CONFIG/src/config.c
+@@ -928,10 +928,8 @@
+         "      -Si nocygwin <0/1> : Do/don't depend on GPL cygwin library\n");
+       fprintf(stderr,
+         "                           (Windows compiler/cygwin install only)\n");
+-/* Disabled due to abuse
+       fprintf(stderr,
+         "      -Si cputhrchk <0/1> : Ignore/heed CPU throttle probe\n");
+- */
+       fprintf(stderr,
+            "   -tl <#> <list> : set # of threads, use list of affinity IDs\n");
+       fprintf(stderr,
+@@ -1129,6 +1127,8 @@
+             *NoF77 = k;
+          else if (!strcmp(sp0, "nocygwin"))
+             *NoCygwin = k;
++         else if (!strcmp(sp0, "cputhrchk"))
++            *ThrChk = k;
+          else if (!strcmp(sp0, "kern"))
+             gcc3 = sp;
+          else if (!strcmp(sp0, "ADdir") || !strcmp(sp0, "addir"))
diff --git a/debian/patches/series b/debian/patches/series
index cd01044..bcf031d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,4 @@ kfreebsd.diff
 armel-is-v4t.diff
 armhf.diff
 fix-non-threaded-build.diff
+cpu-throttling-check.diff
diff --git a/debian/rules b/debian/rules
index b810ad9..4c850b2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -129,7 +129,7 @@ configure-stamp:
 		mkdir -p build/$$targetName;					\
 		cd build/$$targetName; 							\
 		if test "$(ARCHS)" != "base__"; then 		\
-		../../configure $(COMMON_CONFIG_PARAMS) -t 0 -Ss ADdir ../../../debian/archdefs/$(DEB_HOST_ARCH_CPU);	\
+		../../configure $(COMMON_CONFIG_PARAMS) -t 0 -Ss ADdir ../../../debian/archdefs/$(DEB_HOST_ARCH_CPU) -Si cputhrchk 0;	\
 		else						\
 		../../configure $(COMMON_CONFIG_PARAMS);	\
 		fi;						\

-- 
ATLAS packaging for Debian