r36478 - in /packages/atlas/trunk/debian: changelog control patches/21_mips2.diff rules

[sylvestre at users.alioth.debian.org]

Author: sylvestre
Date: Sun May 16 10:46:22 2010
New Revision: 36478

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36478
Log:
  * sse3 & core2sse3 packages removed for hurd
  * Fix a build issue under mips & mipsel (patch 21_mips2.diff)
  * Fix a custom build issue. Thanks to Adrian Benson for the patch
    (Closes: #576987, #579990)

Added:
    packages/atlas/trunk/debian/patches/21_mips2.diff
Modified:
    packages/atlas/trunk/debian/changelog
    packages/atlas/trunk/debian/control
    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=36478&op=diff
==============================================================================
--- packages/atlas/trunk/debian/changelog (original)
+++ packages/atlas/trunk/debian/changelog Sun May 16 10:46:22 2010
@@ -1,3 +1,12 @@
+atlas (3.8.3-22) unstable; urgency=low
+
+  * sse3 & core2sse3 packages removed for hurd
+  * Fix a build issue under mips & mipsel (patch 21_mips2.diff)
+  * Fix a custom build issue. Thanks to Adrian Benson for the patch
+    (Closes: #576987, #579990)
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Tue, 11 May 2010 11:39:10 +0200
+
 atlas (3.8.3-21) unstable; urgency=low
 
   * Maintainer changed to the Debian Science Team

Modified: packages/atlas/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/trunk/debian/control?rev=36478&op=diff
==============================================================================
--- packages/atlas/trunk/debian/control (original)
+++ packages/atlas/trunk/debian/control Sun May 16 10:46:22 2010
@@ -201,7 +201,7 @@
 
 Package: libatlas3gf-sse3
 Section: libs
-Architecture: i386 kfreebsd-i386 hurd-i386
+Architecture: i386 kfreebsd-i386 
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Provides: libatlas.so.3gf, libblas.so.3gf, liblapack.so.3gf
 Suggests: libblas3gf, liblapack3gf
@@ -227,7 +227,7 @@
 
 Package: libatlas-sse3-dev
 Section: libdevel
-Architecture: i386 kfreebsd-i386 hurd-i386
+Architecture: i386 kfreebsd-i386
 Depends: libatlas3gf-sse3 (= ${binary:Version}), libatlas-dev, ${misc:Depends}, ${shlibs:Depends}
 Provides: libatlas-3gf.so, libblas-3gf.so, liblapack-3gf.so
 Conflicts: atlas2-sse3-dev, atlas3-sse3-dev, libblas-dev (<< 1.2-5), 
@@ -247,7 +247,7 @@
 
 Package: libatlas3gf-core2sse3
 Section: libs
-Architecture: i386 kfreebsd-i386 hurd-i386 amd64
+Architecture: i386 kfreebsd-i386 amd64
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Provides: libatlas.so.3gf, libblas.so.3gf, liblapack.so.3gf
 Suggests: libblas3gf, liblapack3gf
@@ -274,7 +274,7 @@
 
 Package: libatlas-core2sse3-dev
 Section: libdevel
-Architecture: i386 kfreebsd-i386 hurd-i386 amd64
+Architecture: i386 kfreebsd-i386 amd64
 Depends: libatlas3gf-core2sse3 (= ${binary:Version}), libatlas-dev, ${misc:Depends}, ${shlibs:Depends}
 Provides: libatlas-3gf.so, libblas-3gf.so, liblapack-3gf.so
 Conflicts: atlas2-sse2-dev, atlas3-sse2-dev, libblas-dev (<< 1.2-5), 

Added: packages/atlas/trunk/debian/patches/21_mips2.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/trunk/debian/patches/21_mips2.diff?rev=36478&op=file
==============================================================================
--- packages/atlas/trunk/debian/patches/21_mips2.diff (added)
+++ packages/atlas/trunk/debian/patches/21_mips2.diff Sun May 16 10:46:22 2010
@@ -1,0 +1,28 @@
+Index: atlas-3.8.3/CONFIG/src/SpewMakeInc.c
+===================================================================
+--- atlas-3.8.3.orig/CONFIG/src/SpewMakeInc.c	2010-05-11 09:36:12.000000000 +0000
++++ atlas-3.8.3/CONFIG/src/SpewMakeInc.c	2010-05-11 09:36:34.000000000 +0000
+@@ -347,7 +347,8 @@
+    if (MachIsALPHA(arch))
+      return(sp);
+    if (MachIsMIPS(arch))
+-      return((ptrbits == 64) ? "-mabi=64" : "-mabi=n32");
++	return(sp);
++//      return((ptrbits == 64) ? "-mabi=64" : "-mabi=n32");
+    if (!CompIsGcc(comp))
+    {
+ /*
+Index: atlas-3.8.3/CONFIG/src/probe_comp.c
+===================================================================
+--- atlas-3.8.3.orig/CONFIG/src/probe_comp.c	2010-05-11 09:32:40.000000000 +0000
++++ atlas-3.8.3/CONFIG/src/probe_comp.c	2010-05-11 09:36:03.000000000 +0000
+@@ -517,7 +517,8 @@
+    if (MachIsALPHA(arch))
+      return(sp);
+    if (MachIsMIPS(arch))
+-      return((ptrbits == 64) ? "-mabi=64" : "-mabi=n32");
++	return(sp);
++//      return((ptrbits == 64) ? "-mabi=64" : "-mabi=n32");
+    if (!CompIsGcc(comp))
+    {
+ /*

Modified: packages/atlas/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/trunk/debian/rules?rev=36478&op=diff
==============================================================================
--- packages/atlas/trunk/debian/rules (original)
+++ packages/atlas/trunk/debian/rules Sun May 16 10:46:22 2010
@@ -110,14 +110,17 @@
 custom-stamp:
 		rm -f configure-stamp
 
-		ncpu=$$(LANG=C cpufreq-info | grep "analyzing CPU" -c); \
-		for (( cpu=0 ; cpu < $$ncpu ; cpu++)); do \
-		if test $$(cpufreq-info -p 2>&1 > /dev/null; echo $$?) -eq 0 -a -z "$$(LANG=C cpufreq-info -p -c $$cpu | grep performance)" ; then \
-			echo "frequency governor on cpu=$$cpu is not set to 'performance'"; \
+		ncpu=$$(LANG=C cpufreq-info | grep "analyzing CPU" -c);\
+		cpu=0;\
+		while test $$cpu -lt $$ncpu ; do\
+		if test $$(cpufreq-info -p 2>&1 > /dev/null; echo $$?) \
+			-eq 0 -a -z "$$(LANG=C cpufreq-info -p -c $$cpu | grep performance)" ; then \
+			echo "frequency governor on cpu=$$ncpu is not set to 'performance'"; \
 			echo "run: 'sudo cpufreq-set -g performance -c cpu#' for each cpu"; \
 			echo "aborting atlas build"; \
 			exit 1; \
 		fi; \
+		cpu=$$((cpu+1)) ;\
 		done
 
 		# Here, the trick is pretty simple: