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

[Sébastien Villemot]

The following commit has been merged in the master branch:
commit f7c99d59791090299d9abda21357ffc72ac7c2b0
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Fri Jun 7 16:01:01 2013 +0200

    armel-is-v4t.diff: new patch, prevents FTBFS on armel; otherwise, ATLAS uses asm constructs too recent for the platform

diff --git a/debian/changelog b/debian/changelog
index f7d5898..9a8f8e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,6 +31,8 @@ atlas (3.10.1-1) UNRELEASED; urgency=low
     package (Closes: #697431)
   * Bump Standards-Version to 3.9.4. As a consequence, add Built-Using
     fields because the package embeds stuff from liblapack-pic
+  * armel-is-v4t.diff: new patch, prevents FTBFS on armel; otherwise,
+    ATLAS uses asm constructs too recent for the platform
 
  -- Sylvestre Ledru <sylvestre at debian.org>  Mon, 16 Jul 2012 14:57:17 +0200
 
diff --git a/debian/patches/armel-is-v4t.diff b/debian/patches/armel-is-v4t.diff
new file mode 100644
index 0000000..f099f48
--- /dev/null
+++ b/debian/patches/armel-is-v4t.diff
@@ -0,0 +1,20 @@
+Description: On armel, do not use asm constructs provided by ATLAS
+ Since 3.10, ATLAS incorporates asm constructs for ARM processors. However,
+ these are too recent for the Debian armel port (which is ARMv4t). This patch
+ ensures that these asm constructs are not used on that port.
+Author: Sébastien Villemot <sebastien at debian.org>
+Forwarded: no
+Last-Update: 2013-06-07
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/CONFIG/src/backend/probe_gas_arm.S
++++ b/CONFIG/src/backend/probe_gas_arm.S
+@@ -1,5 +1,8 @@
+ #define ATL_GAS_ARM
+ #include "atlas_asm.h"
++#ifdef __ARM_ARCH_4T__
++#error "Debian armel is only v4t, but ATLAS needs a more recent ISA"
++#endif
+ #
+ # Linux ARM assembler for:
+ # int asm_probe(int i)
diff --git a/debian/patches/series b/debian/patches/series
index c9fe869..d3f70b9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ shared_libraries.diff
 21_mips2.diff
 22_sh.diff
 kfreebsd.diff
+armel-is-v4t.diff

-- 
ATLAS packaging for Debian