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

[sylvestre at users.alioth.debian.org]

Author: sylvestre
Date: Tue May 10 18:47:47 2011
New Revision: 38483

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=38483
Log:
atlas (3.8.3-31) UNRELEASED; urgency=low

  * force -j 1 of make removed
  * -Si cputhrchk 0 removed


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=38483&op=diff
==============================================================================
--- packages/atlas/trunk/debian/changelog (original)
+++ packages/atlas/trunk/debian/changelog Tue May 10 18:47:47 2011
@@ -1,3 +1,10 @@
+atlas (3.8.3-31) UNRELEASED; urgency=low
+
+  * force -j 1 of make removed
+  * -Si cputhrchk 0 removed
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Tue, 10 May 2011 20:40:12 +0200
+
 atlas (3.8.3-30) unstable; urgency=low
 
   * Update of the README.Debian (typos, old stuff, etc)

Modified: packages/atlas/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/trunk/debian/rules?rev=38483&op=diff
==============================================================================
--- packages/atlas/trunk/debian/rules (original)
+++ packages/atlas/trunk/debian/rules Tue May 10 18:47:47 2011
@@ -41,13 +41,12 @@
 	-b $(MODE_BITWIDTH) 							\
 	-Fa alg '-Wa,--noexecstack -fPIC' 				\
 	-Ss f77lib "-L$(GFORTRAN_LIB_PATH) -lgfortran -lgcc_s -lpthread"  \
-	-Ss pmake '$(MAKE) -j 1'					\
+	-Ss pmake '$(MAKE)'					\
 	--with-netlib-lapack=/usr/lib/liblapack_pic.a 	\
 	-A $$atlasArch									\
 	-V $$atlasISA 									\
-	-v 2											\
-	-Si cputhrchk 0
-
+	-v 2
+# ../../configure --cc="cc" --cflags="-g -O2" -D c -DWALL -b 64 -Fa alg '-Wa,--noexecstack -fPIC' -Ss flapack /usr/lib/liblapack_pic.a -Ss f77lib "-L/usr/lib/gcc/x86_64-linux-gnu/4.4.5/ -lgfortran -lgcc_s -lpthread" -Ss pmake '/usr/bin/make -j 1' -A 0 -V 1 -v 2 -Si cputhrchk 0 -t 2
 custom: custom-stamp
 
 # Build a custom package optimized for the current arch
@@ -92,11 +91,7 @@
 		atlasISA=`echo $(ARCHS)|sed -e "s|.*_.*_\(.*\)|\1|g"`; \
 		mkdir -p build/$$targetName;					\
 		cd build/$$targetName; 							\
-		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}'; \