r45027 - in /packages/atlas/trunk/debian: changelog rules

[sebastien-guest at users.alioth.debian.org]

Author: sebastien-guest
Date: Wed Jun 13 15:55:50 2012
New Revision: 45027

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45027
Log:
Force generic x86 CPU when building a non-custom package on an x86 arch
(Closes: #676885)


Modified:
    packages/atlas/trunk/debian/changelog
    packages/atlas/trunk/debian/rules

Modified: packages/atlas/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/trunk/debian/changelog?rev=45027&op=diff
==============================================================================
--- packages/atlas/trunk/debian/changelog (original)
+++ packages/atlas/trunk/debian/changelog Wed Jun 13 15:55:50 2012
@@ -1,3 +1,10 @@
+atlas (3.8.4-7) UNRELEASED; urgency=low
+
+  * Force generic x86 CPU when building a non-custom package on an x86 arch
+    (Closes: #676885)
+
+ -- Sébastien Villemot <sebastien.villemot at ens.fr>  Wed, 13 Jun 2012 16:33:20 +0200
+
 atlas (3.8.4-6) unstable; urgency=low
 
   * Yet an other stupid bug... 

Modified: packages/atlas/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/trunk/debian/rules?rev=45027&op=diff
==============================================================================
--- packages/atlas/trunk/debian/rules (original)
+++ packages/atlas/trunk/debian/rules Wed Jun 13 15:55:50 2012
@@ -11,8 +11,15 @@
 MODE_BITWIDTH = 32
 
 # 0 means Unknown CPU. Leave Atlas find out
-# 1 means no extension
+# 26 means Generic x86 CPU
+# 1 means no instruction set extension
+X86_ARCHS := amd64 i386 kfreebsd-amd64 kfreebsd-i386 hurd-i386
+ifneq (,$(findstring $(DEB_HOST_ARCH),$(X86_ARCHS)))
+ARCHS=base_26_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/
 
 # # see what do we do with the amd64 / intel 64