From 7f70f03be58bff0c706ddc4f1996e65a5b3eac8e Mon Sep 17 00:00:00 2001 From: Quentin Spencer Date: Feb 28 2008 16:22:43 +0000 Subject: Close bugs 426086 and 432744. --- diff --git a/atlas-3.6.0-ia64-configure.patch b/atlas-3.6.0-ia64-configure.patch new file mode 100644 index 0000000..5146cc5 --- /dev/null +++ b/atlas-3.6.0-ia64-configure.patch @@ -0,0 +1,12 @@ +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; diff --git a/atlas.spec b/atlas.spec index 65ab9d3..6db6ab9 100644 --- a/atlas.spec +++ b/atlas.spec @@ -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 @@ Source0: http://prdownloads.sourceforge.net/math-atlas/%{name}%{version}. 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 @@ optimizations for the AltiVec extensions to the PowerPC architecture. %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 @@ all compile-time optimizations enabled. %setup -q -n ATLAS %patch0 -p1 %patch1 -p0 +%patch2 -p1 cp %{SOURCE1} doc @@ -533,6 +545,10 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Thu Feb 28 2008 Quentin Spencer 3.6.0-14 +- Enable compilation on alpha (bug 426086). +- Patch for compilation on ia64 (bug 432744). + * Tue Feb 19 2008 Fedora Release Engineering - 3.6.0-13 - Autorebuild for GCC 4.3