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

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

Author: sebastien-guest
Date: Wed Jun 13 15:58:14 2012
New Revision: 45028

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45028
Log:
Force 2 threads when not building a custom package (as was the case up
to and including 3.8.3-30)

This should fix some FTBFS


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=45028&op=diff
==============================================================================
--- packages/atlas/trunk/debian/changelog (original)
+++ packages/atlas/trunk/debian/changelog Wed Jun 13 15:58:14 2012
@@ -2,6 +2,8 @@
 
   * Force generic x86 CPU when building a non-custom package on an x86 arch
     (Closes: #676885)
+  * Force 2 threads when not building a custom package (as was the case up
+    to and including 3.8.3-30)
 
  -- Sébastien Villemot <sebastien.villemot at ens.fr>  Wed, 13 Jun 2012 16:33:20 +0200
 

Modified: packages/atlas/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/trunk/debian/rules?rev=45028&op=diff
==============================================================================
--- packages/atlas/trunk/debian/rules (original)
+++ packages/atlas/trunk/debian/rules Wed Jun 13 15:58:14 2012
@@ -98,7 +98,11 @@
 		atlasISA=`echo $(ARCHS)|sed -e "s|.*_.*_\(.*\)|\1|g"`; \
 		mkdir -p build/$$targetName;					\
 		cd build/$$targetName; 							\
-		../../configure $(COMMON_CONFIG_PARAMS); 		\
+		if test "$(ARCHS)" != "base__"; then 		\
+		../../configure $(COMMON_CONFIG_PARAMS) -t 2;	\
+		else						\
+		../../configure $(COMMON_CONFIG_PARAMS);	\
+		fi;						\
 		echo "Configure done. targetName = $$targetName / atlasArch = $$atlasArch / atlasISA = $$atlasISA";								\
 		if test ! -s Make.inc; then echo "Configure failed: Make.inc not found"; exit 1; fi;											\
 		cat Make.inc |grep ARCH|head -1|awk '{print $$3}'; \