rpms/atlas/devel atlas-3.6.0-ia64-configure.patch, NONE, 1.1 atlas.spec, 1.9, 1.10

[Quentin Spencer (qspencer)]

Author: qspencer

Update of /cvs/extras/rpms/atlas/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23815

Modified Files:
	atlas.spec 
Added Files:
	atlas-3.6.0-ia64-configure.patch 
Log Message:
Close bugs 426086 and 432744.

atlas-3.6.0-ia64-configure.patch:

--- NEW FILE atlas-3.6.0-ia64-configure.patch ---
diff -up ATLAS/config.c.broken ATLAS/config.c
--- ATLAS/config.c.broken	2008-02-13 17:33:21.000000000 -0500
+++ ATLAS/config.c	2008-02-13 17:34:03.000000000 -0500
@@ -3254,7 +3254,7 @@ enum MACHTYPE GetArch(FILE *fpout, FILE 
          fprintf(stdout, "   1. IA-64 Itanium 1\n");
          fprintf(stdout, "   2. IA-64 Itanium 2\n");
          fprintf(stdout, "   3. Other/UNKNOWN\n");
-         i = GetIntRange(3, 1, 2, "", "machine number");
+         i = GetIntRange(2, 1, 2, "", "machine number");
          if (i == 1) mach = IA64Itan;
          else if (i == 2) mach = IA64Itan2;
          break;


Index: atlas.spec
===================================================================
RCS file: /cvs/extras/rpms/atlas/devel/atlas.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- atlas.spec	19 Feb 2008 20:20:31 -0000	1.9
+++ atlas.spec	28 Feb 2008 16:22:43 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           atlas
 Version:        3.6.0
-Release:        13%{?dist}
+Release:        14%{?dist}
 Summary:        Automatically Tuned Linear Algebra Software
 
 Group:          System Environment/Libraries
@@ -10,6 +10,7 @@
 Source1:        README.Fedora
 Patch0:         http://ftp.debian.org/debian/pool/main/a/atlas3/%{name}3_%{version}-20.diff.gz
 Patch1:         %{name}-%{version}-gfortran.patch
+Patch2:         %{name}-%{version}-ia64-configure.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       /etc/ld.so.conf.d
@@ -139,6 +140,16 @@
 %define bit 1
 %endif
 
+%ifarch alpha
+%define archt alpha
+%define types base
+%endif
+
+%ifarch alphaev6
+%define archt alpha
+%define types ev6
+%endif
+
 %if "%{?enable_custom_atlas}" == "1"
 # This flag enables building customized ATLAS libraries with all
 # compile-time optimizations. Note that compilation will take a very
@@ -169,6 +180,7 @@
 %setup -q -n ATLAS
 %patch0 -p1
 %patch1 -p0
+%patch2 -p1
 cp %{SOURCE1} doc
 
 
@@ -533,6 +545,10 @@
 %endif
 
 %changelog
+* Thu Feb 28 2008 Quentin Spencer <qspencer at users.sourceforge.net> 3.6.0-14
+- Enable compilation on alpha (bug 426086).
+- Patch for compilation on ia64 (bug 432744).
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 3.6.0-13
 - Autorebuild for GCC 4.3