r36273 - in /packages/atlas/trunk/debian: changelog patches/hurd.diff rules

[sylvestre at users.alioth.debian.org]

Author: sylvestre
Date: Sat Mar 13 18:42:25 2010
New Revision: 36273

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36273
Log:
Support of hurd (hurd.diff)

Added:
    packages/atlas/trunk/debian/patches/hurd.diff
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=36273&op=diff
==============================================================================
--- packages/atlas/trunk/debian/changelog (original)
+++ packages/atlas/trunk/debian/changelog Sat Mar 13 18:42:25 2010
@@ -1,3 +1,16 @@
+atlas (3.8.3-13) experimental; urgency=low
+
+  * Support of hurd (hurd.diff)
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Wed, 10 Mar 2010 13:16:42 +0100
+
+atlas (3.8.3-12) experimental; urgency=low
+
+  * Don't make the assumption that /proc/cpuinfo is available everywhere.
+    Should fix the build issue on hurd-i386
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Sun, 07 Mar 2010 12:14:38 +0100
+
 atlas (3.8.3-11) experimental; urgency=low
 
   * Explicit link against lgfortran & libgcc_s

Added: packages/atlas/trunk/debian/patches/hurd.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/trunk/debian/patches/hurd.diff?rev=36273&op=file
==============================================================================
--- packages/atlas/trunk/debian/patches/hurd.diff (added)
+++ packages/atlas/trunk/debian/patches/hurd.diff Sat Mar 13 18:42:25 2010
@@ -1,0 +1,52 @@
+diff -u atlas-3.8.3.orig/CONFIG/src/probe_comp.c atlas-3.8.3/CONFIG/src/probe_comp.c
+--- atlas-3.8.3.orig/CONFIG/src/probe_comp.c	2010-02-25 01:10:09.000000000 +0100
++++ atlas-3.8.3/CONFIG/src/probe_comp.c	2010-03-10 13:21:04.000000000 +0100
+@@ -221,13 +224,16 @@
+    }
+    return(0);
+ }
+-void NamesToBitField(int MACH, char *str, int *bits)
++
++
++
++
++void NamesToBitField(int MACH2, char *str, int *bits) {
+ /*
+  * Takes a list of machine (MACH=1) or OS (MACH=0) names and translates them
+  * to their enumerated type numbers, and sets the appropriate bit in the
+  * bits field
+  */
+-{
+    char name[128];
+    int i=0;
+    while(*str)
+@@ -240,14 +246,14 @@
+             i = 0;
+          else
+          {
+-            if (MACH)
++            if (MACH2)
+                i = MachNameToInt(name);
+             else
+                i = OSNameToInt(name);
+             if (!i)
+             {
+                fprintf(stderr, "Nonsensical %s name in list: %s\n",
+-                       MACH ? "machine" : "OS", str);
++                       MACH2 ? "machine" : "OS", str);
+                exit(1);
+             }
+          }
+diff -u atlas-3.8.3.orig/CONFIG/src/probe_OS.c atlas-3.8.3/CONFIG/src/probe_OS.c
+--- atlas-3.8.3.orig/CONFIG/src/probe_OS.c	2009-02-18 19:47:37.000000000 +0100
++++ atlas-3.8.3/CONFIG/src/probe_OS.c	2010-03-10 13:21:05.000000000 +0100
+@@ -14,7 +14,7 @@
+    ierr = CmndOneLine(targ, ln2, ln);
+    if (ierr == 0)
+    {
+-      if(strstr(ln, "Linux")) OS = OSLinux;
++      if(strstr(ln, "Linux") || strstr(ln, "GNU")) OS = OSLinux;
+       else if(strstr(ln, "FreeBSD")) OS = OSFreeBSD;
+       else if (strstr(ln, "Darwin")) OS = OSOSX;
+       else if(strstr(ln, "SunOS"))
+

Modified: packages/atlas/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/trunk/debian/rules?rev=36273&op=diff
==============================================================================
--- packages/atlas/trunk/debian/rules (original)
+++ packages/atlas/trunk/debian/rules Sat Mar 13 18:42:25 2010
@@ -123,10 +123,12 @@
 
 configure-stamp:
 		if test -n "$(CHECK_EXTENSIONS)"; then \
-		if ! grep ^flags /proc/cpuinfo | grep -q $(CHECK_EXTENSIONS); then \
-			echo "Warning: In order to build Atlas under $(DEB_HOST_ARCH_CPU), you need the CPU extension $(CHECK_EXTENSIONS) available on your CPU"; 	\
-			exit 1; \
-		fi \
+			if test -f /proc/cpuinfo; then \
+			if ! grep ^flags /proc/cpuinfo | grep -q $(CHECK_EXTENSIONS); then \
+				echo "Warning: In order to build Atlas under $(DEB_HOST_ARCH_CPU), you need the CPU extension $(CHECK_EXTENSIONS) available on your CPU"; 	\
+				exit 1; \
+			fi \
+			fi \
 		fi
 		dh_testdir
 		for ext in $(ARCHS); do							\