On 09/17/2013 10:42 AM, Patsy Franklin wrote:
Hi,
This patch changes the glibc.spec file to require a specific version (or later) of
binutils for s390/s390x support.
OK to commit?
Looks good to me. Please check this in to rawhide, f20, and f19 (if the latter two need
it).
-Patsy
glibc-rh804768-specfile.patch
diff --git a/glibc.spec b/glibc.spec
index 0bd7d95..b3378e6 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -27,7 +27,7 @@
Summary: The GNU libc libraries
Name: glibc
Version: %{glibcversion}
-Release: 14%{?dist}
+Release: 15%{?dist}
# GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
# Things that are linked directly into dynamically linked programs
# and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
@@ -209,9 +209,16 @@ Conflicts: kernel < %{enablekernel}
BuildRequires: binutils >= 2.20.51.0.2
Conflicts: binutils < 2.20.51.0.2
%else
+%ifarch s390 s390x
+# Needed for STT_GNU_IFUNC support for s390/390x
+BuildRequires: binutils >= 2.23.52.0.1-8
+Conflicts: binutils < 2.23.52.0.1-8
+%else
+# Default to this version
BuildRequires: binutils >= 2.19.51.0.10
Conflicts: binutils < 2.19.51.0.10
%endif
+%endif
# Earlier releases have broken support for IRELATIVE relocations
Conflicts: prelink < 0.4.2
%else
@@ -1235,6 +1242,9 @@ rm -f *.filelist*
%endif
%changelog
+* Tue Sep 17 2013 Patsy Franklin <pfrankli(a)redhat.com> - 2.17-15
+- Fix conditional requiring specific binutils for s390/s390x.
+
* Mon Aug 26 2013 Siddhesh Poyarekar <siddhesh(a)redhat.com> - 2.17-14
- Add systemd to BuildRequires (#999924).
- Expand sizes of some types in strcoll (#855399, CVE-2012-4424).