summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavel Raiskup <praiskup@redhat.com>2013-10-23 10:51:05 +0200
committerPavel Raiskup <praiskup@redhat.com>2013-10-23 10:51:05 +0200
commitdfc43d7286d1cab7f47b68734021fc71e6567439 (patch)
treee33facf4cb78cd6c8abee1da4dbea8d0c26dc4a4
parent3f58a9eaa8c8e01799124fc80d8b2675209ce3f9 (diff)
downloadlibtool-dfc43d7286d1cab7f47b68734021fc71e6567439.tar.gz
libtool-dfc43d7286d1cab7f47b68734021fc71e6567439.tar.xz
libtool-dfc43d7286d1cab7f47b68734021fc71e6567439.zip
m4: fix powerpcle patch
Thanks to Brent Baude; I backported the fix badly before. Version: 2.4.2-22
-rw-r--r--libtool-2.4.2-powerpcle-linux.patch4
-rw-r--r--libtool.spec7
2 files changed, 7 insertions, 4 deletions
diff --git a/libtool-2.4.2-powerpcle-linux.patch b/libtool-2.4.2-powerpcle-linux.patch
index 3455356..926d6aa 100644
--- a/libtool-2.4.2-powerpcle-linux.patch
+++ b/libtool-2.4.2-powerpcle-linux.patch
@@ -16,10 +16,10 @@ index 56666f0..126202f 100644
LD="${LD-ld} -m elf_i386"
;;
- ppc64-*linux*|powerpc64-*linux*)
-+ powerpcle-*linux*)
++ powerpc64le-*linux*)
+ LD="${LD-ld} -m elf32lppclinux"
+ ;;
-+ powerpc-*linux*)
++ powerpc64-*linux*)
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
diff --git a/libtool.spec b/libtool.spec
index 7215ad1..4840b35 100644
--- a/libtool.spec
+++ b/libtool.spec
@@ -3,7 +3,7 @@
Summary: The GNU Portable Library Tool
Name: libtool
Version: 2.4.2
-Release: 21%{?dist}
+Release: 22%{?dist}
License: GPLv2+ and LGPLv2+ and GFDL
URL: http://www.gnu.org/software/libtool/
Group: Development/Tools
@@ -19,7 +19,7 @@ Patch2: libtool-2.4.2-tar-no-owner.patch
# powerpc*le-linux support
# ~> upstream
-# ~> git diff c37bc1a3..bd998a7e
+# ~> `git diff c37bc1a3..8a8dfaec m4/libtool.m4`
Patch3: libtool-2.4.2-powerpcle-linux.patch
Requires(post): /sbin/install-info
@@ -165,6 +165,9 @@ fi
%{_libdir}/libltdl.so
%changelog
+* Wed Oct 23 2013 Pavel Raiskup <praiskup@redhat.com> - 2.4.2-22
+- fix powerpcle patch to reflect what is really in upstream
+
* Thu Oct 17 2013 Jakub Jelinek <jakub@redhat.com> - 2.4.2-21
- rebuilt for gcc 4.8.2