[prelink] Specifically switch the dynamic linker on ARM hard float (longterm fix req.)

Peter Robinson pbrobinson at fedoraproject.org
Thu Nov 29 09:11:02 UTC 2012


commit 7aafa0f28397a030292ff8c351548b2f830cc76d
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Thu Nov 29 09:10:48 2012 +0000

    Specifically switch the dynamic linker on ARM hard float (longterm fix req.)

 prelink.spec |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)
---
diff --git a/prelink.spec b/prelink.spec
index 49264e8..d16acc2 100644
--- a/prelink.spec
+++ b/prelink.spec
@@ -1,7 +1,7 @@
 Summary: An ELF prelinking utility
 Name: prelink
 Version: 0.4.6
-Release: 7%{?dist}
+Release: 8%{?dist}
 %global svnver 200
 License: GPLv2+
 Group: System Environment/Base
@@ -12,6 +12,7 @@ Source: http://people.redhat.com/jakub/prelink/prelink-%{date}.tar.bz2
 Source2: prelink.conf
 Source3: prelink.cron
 Source4: prelink.sysconfig
+Patch0: prelink-armhf-dynamic-linker.patch
 
 BuildRequires: elfutils-libelf-devel-static
 BuildRequires: libselinux-static, libselinux-utils
@@ -29,6 +30,12 @@ and thus programs come up faster.
 %prep
 %setup -q -n prelink
 
+# We have two possible dynamic linkers on ARM (soft/hard float ABI). For now,
+# specifically patch the name of the linker on hard float systems. FIXME.
+%ifarch armv7hl
+%patch0 -p1 -b .armhfp-dynamic-linker
+%endif
+
 %build
 sed -i -e '/^prelink_LDADD/s/$/ -lpthread/' src/Makefile.{am,in}
 %configure --disable-shared
@@ -99,6 +106,9 @@ touch /var/lib/prelink/force
 %attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/log/prelink/prelink.log
 
 %changelog
+* Thu Nov 29 2012 Jon Masters <jcm at jonmasters.org> - 0.4.6-8
+- Specifically switch the dynamic linker on ARM hard float (longterm fix req.)
+
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.6-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 


More information about the scm-commits mailing list