[prelink] fix ftbfs on ARM

Peter Robinson pbrobinson at fedoraproject.org
Wed Apr 4 14:41:53 UTC 2012


commit ce1ed3d7fc66078233e6f152c49dc5d82e8a5d95
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Wed Apr 4 15:41:48 2012 +0100

    fix ftbfs on ARM

 prelink-arm-fix.patch |   11 +++++++++++
 prelink.spec          |    8 +++++++-
 2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/prelink-arm-fix.patch b/prelink-arm-fix.patch
new file mode 100644
index 0000000..efeddd3
--- /dev/null
+++ b/prelink-arm-fix.patch
@@ -0,0 +1,11 @@
+diff -urNp prelink_orig/src/get.c prelink/src/get.c
+--- prelink_orig/src/get.c	2009-06-12 08:01:48.000000000 -0400
++++ prelink/src/get.c	2012-04-04 05:08:47.000000000 -0400
+@@ -30,6 +30,7 @@ int
+ is_ldso_soname (const char *soname)
+ {
+   if (! strcmp (soname, "ld-linux.so.2")
++      || ! strcmp (soname, "ld-linux.so.3")
+       || ! strcmp (soname, "ld.so.1")
+       || ! strcmp (soname, "ld-linux-ia64.so.2")
+       || ! strcmp (soname, "ld-linux-x86-64.so.2")
diff --git a/prelink.spec b/prelink.spec
index e1d8aee..0294070 100644
--- a/prelink.spec
+++ b/prelink.spec
@@ -1,7 +1,7 @@
 Summary: An ELF prelinking utility
 Name: prelink
 Version: 0.4.6
-Release: 4%{?dist}
+Release: 5%{?dist}
 %global svnver 195
 License: GPLv2+
 Group: System Environment/Base
@@ -13,6 +13,8 @@ Source2: prelink.conf
 Source3: prelink.cron
 Source4: prelink.sysconfig
 
+Patch0: prelink-arm-fix.patch
+
 BuildRequires: elfutils-libelf-devel-static
 BuildRequires: libselinux-static, libselinux-utils
 BuildRequires: glibc-static
@@ -28,6 +30,7 @@ and thus programs come up faster.
 
 %prep
 %setup -q -n prelink
+%patch0 -p1 -b .arm
 
 %build
 sed -i -e '/^prelink_LDADD/s/$/ -lpthread/' src/Makefile.{am,in}
@@ -99,6 +102,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
+* Wed Apr  4 2012 Peter Robinson <pbrobinson at fedoraproject.org> - 0.4.6-5
+- Add patch to fix FTBFS on ARM
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.6-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 


More information about the scm-commits mailing list