[atlas] 03/10: Drop d/p/cpu-throttling-check.diff, no longer needed.

[Sébastien Villemot]

This is an automated email from the git hooks/post-receive script.

sebastien pushed a commit to branch master
in repository atlas.

commit 346e79e6f2b1c61253908a3a74daf9d334928513
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Fri Jul 29 15:24:20 2016 +0200

    Drop d/p/cpu-throttling-check.diff, no longer needed.
    
    Replace it with new --cripple-atlas-performance option.
    
    Gbp-Dch: Full
---
 debian/patches/cpu-throttling-check.diff | 30 ------------------------------
 debian/patches/series                    |  1 -
 debian/rules                             |  5 ++++-
 3 files changed, 4 insertions(+), 32 deletions(-)

diff --git a/debian/patches/cpu-throttling-check.diff b/debian/patches/cpu-throttling-check.diff
deleted file mode 100644
index 20b9df2..0000000
--- a/debian/patches/cpu-throttling-check.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-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 1447bfd..fccb874 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,7 +11,6 @@ shared_libraries.diff
 kfreebsd.diff
 armel-is-v4t.diff
 armhf.diff
-cpu-throttling-check.diff
 generic.diff
 ppc64el-new-archdef-name.patch
 ppc64el-abiv2.patch
diff --git a/debian/rules b/debian/rules
index d8152f7..31d5750 100755
--- a/debian/rules
+++ b/debian/rules
@@ -62,10 +62,13 @@ COMMON_CONFIG_PARAMS += -D c -DATL_ARM_HARDFP=1
 endif
 
 # Flags used only for the generic package
+# The cripple-atlas-performance flag is needed for disabling the CPU throttling
+#  check, because on some buildds CPU throttling is enabled and we have no way
+#  of disabling it.
 GENERIC_CONFIG_PARAMS := \
 	-t 0 \
 	-Ss ADdir ../../../debian/archdefs/$(DEB_HOST_ARCH_CPU) \
-	-Si cputhrchk 0
+	--cripple-atlas-performance
 
 # The archdefs provided by ATLAS are unsuitable for armhf (see details in
 # armhf.diff patch)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/atlas.git