From cd38f96a58cc749709ecda302396af9cc2b2adfd Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Aug 09 2012 17:21:53 +0000 Subject: Thu Aug 09 2012 Orion Poplawski - 3.8.4-6 - Add patch to properly pass -melf_* to the linker with -Wl (bug 817552) --- diff --git a/atlas-melf.patch b/atlas-melf.patch new file mode 100644 index 0000000..52feec7 --- /dev/null +++ b/atlas-melf.patch @@ -0,0 +1,15 @@ +diff -up ATLAS/CONFIG/src/SpewMakeInc.c.melf ATLAS/CONFIG/src/SpewMakeInc.c +--- ATLAS/CONFIG/src/SpewMakeInc.c.melf 2011-05-14 11:33:24.000000000 -0600 ++++ ATLAS/CONFIG/src/SpewMakeInc.c 2012-08-09 10:52:28.051926489 -0600 +@@ -665,9 +665,9 @@ main(int nargs, char **args) + if (MachIsX86(mach)) + { + if (ptrbits == 32) +- fprintf(fpout, " -melf_i386"); ++ fprintf(fpout, " -Wl,-melf_i386"); + else if (ptrbits == 64) +- fprintf(fpout, " -melf_x86_64"); ++ fprintf(fpout, " -Wl,-melf_x86_64"); + if (OS == OSFreeBSD) + fprintf(fpout, "_fbsd"); + } diff --git a/atlas.spec b/atlas.spec index 99f7d67..8981c0a 100644 --- a/atlas.spec +++ b/atlas.spec @@ -5,7 +5,7 @@ Version: 3.8.4 %if "%{?enable_native_atlas}" != "0" %define dist .native %endif -Release: 5%{?dist} +Release: 6%{?dist} Summary: Automatically Tuned Linear Algebra Software Group: System Environment/Libraries @@ -24,6 +24,9 @@ Source9: IBMz19664.tgz Patch0: atlas-fedora_shared.patch Patch1: atlas-s390port.patch Patch2: atlas-fedora-arm.patch +# Properly pass -melf_* to the linker with -Wl, fixes FTBFS bug 817552 +# https://sourceforge.net/tracker/?func=detail&atid=379484&aid=3555789&group_id=23725 +Patch3: atlas-melf.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-gfortran lapack-static @@ -248,6 +251,7 @@ optimizations for the z10 architecture. %ifarch %{arm} %patch2 -p0 -b .arm %endif +%patch3 -p1 -b .melf cp %{SOURCE1} CONFIG/ARCHS/ cp %{SOURCE2} CONFIG/ARCHS/ cp %{SOURCE3} doc @@ -663,6 +667,9 @@ fi %endif %changelog +- Thu Aug 09 2012 Orion Poplawski - 3.8.4-6 +- Add patch to properly pass -melf_* to the linker with -Wl (bug 817552) + * Wed Jul 18 2012 Fedora Release Engineering - 3.8.4-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild