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

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

Author: sebastien-guest
Date: Fri Jul  6 20:05:38 2012
New Revision: 45217

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45217
Log:
Force generic PPC CPU when building a non-custom package on a PPC arch

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=45217&op=diff
==============================================================================
--- packages/atlas/trunk/debian/changelog (original)
+++ packages/atlas/trunk/debian/changelog Fri Jul  6 20:05:38 2012
@@ -1,6 +1,8 @@
 atlas (3.8.4-9) UNRELEASED; urgency=low
 
   * libatlas-test: put in devel/extra, to reflect override
+  * Force generic PPC CPU when building a non-custom package on a PPC arch
+    (Closes: #680096)
 
  -- Sébastien Villemot <sebastien.villemot at ens.fr>  Fri, 29 Jun 2012 19:13:39 +0000
 

Modified: packages/atlas/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/trunk/debian/rules?rev=45217&op=diff
==============================================================================
--- packages/atlas/trunk/debian/rules (original)
+++ packages/atlas/trunk/debian/rules Fri Jul  6 20:05:38 2012
@@ -10,12 +10,18 @@
 # Pointer bitwidth (default value)
 MODE_BITWIDTH = 32
 
-# 0 means Unknown CPU. Leave Atlas find out
-# 26 means Generic x86 CPU
-# 1 means no instruction set extension
+# First number in ARCHS:
+# - 0 means Unknown CPU. Leave Atlas find out
+# - 1 means POWER3, most generic PowerPC (see #680096)
+# - 26 means Generic x86 CPU
+# Second number in ARCHS:
+# - 1 means no instruction set extension
 X86_ARCHS := amd64 i386 kfreebsd-amd64 kfreebsd-i386 hurd-i386
+PPC_ARCHS := powerpc powerpcspe ppc64
 ifneq (,$(findstring $(DEB_HOST_ARCH),$(X86_ARCHS)))
 ARCHS=base_26_1
+else ifneq (,$(findstring $(DEB_HOST_ARCH),$(PPC_ARCHS)))
+ARCHS=base_1_1
 else
 ARCHS=base_0_1
 endif