diff --git a/glibc.spec b/glibc.spec index 8ee8834..e9f1ea7 100644 --- a/glibc.spec +++ b/glibc.spec @@ -19,13 +19,17 @@ %endif %define rtkaioarches %{ix86} x86_64 ia64 ppc ppc64 s390 s390x %define debuginfocommonarches alpha alphaev6 sparc sparcv9 sparcv9v sparc64 sparc64v +%if 0%{?rhel} >= 6 +%define multiarcharches ppc pp64 %{ix86} x86_64 +%else %define multiarcharches %{ix86} x86_64 +%endif %define _unpackaged_files_terminate_build 0 Summary: The GNU libc libraries Name: glibc Version: %{glibcversion} -Release: 2 +Release: 3 # 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 @@ -62,8 +66,13 @@ BuildRequires: gcc >= 3.2 %endif %ifarch %{multiarcharches} # Need STT_IFUNC support +%ifarch ppc ppc64 +BuildRequires: binutils >= 2.20.51.0.2 +Conflicts: binutils < 2.20.51.0.2 +%else BuildRequires: binutils >= 2.19.51.0.10 Conflicts: binutils < 2.19.51.0.10 +%endif # Earlier releases have broken support for IRELATIVE relocations Conflicts: prelink < 0.4.2 %else @@ -1029,6 +1038,9 @@ rm -f *.filelist* %endif %changelog +* Tue Nov 24 2009 Andreas Schwab - 2.11-3 +- Enable multi-arch support for ppc and ppc64 on RHEL-6 + * Thu Nov 5 2009 Andreas Schwab - 2.11-2 - Fix readahead on powerpc32. - Fix R_PPC64_{JMP_IREL,IRELATIVE} handling. diff --git a/import.log b/import.log index d6a5997..e04f485 100644 --- a/import.log +++ b/import.log @@ -37,3 +37,4 @@ glibc-2_10_90-26:F-12:glibc-2.10.90-26.src.rpm:1255953059 glibc-2_10_90-27:F-12:glibc-2.10.90-27.src.rpm:1256915929 glibc-2_11-1:F-12:glibc-2.11-1.src.rpm:1257175795 glibc-2_11-2:F-12:glibc-2.11-2.src.rpm:1257422307 +glibc-2_11-3:F-12:glibc-2.11-3.src.rpm:1259075120 diff --git a/sources b/sources index 3dc907b..53c571f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 2c990f97e9ff9fb1c3c85fe826e991b9 glibc-2.11.tar.bz2 -bf01fdc5ae4d1ffa2fefc135dbc6d75c glibc-2.11-fedora.tar.bz2 +d7839555afb452d936347ec2d2309ee0 glibc-2.11-fedora.tar.bz2