From 057864be46e85a6461080a94260c6574c9385708 Mon Sep 17 00:00:00 2001 From: David Howells Date: Fri, 13 Jun 2014 16:10:38 +0100 Subject: Fix build error on F21 [BZ 1106093] and apply upstream fixes Sync with binutils-2.24-15 fixing the bfd_set_section_alignment() error [BZ 1106093] Apply the changes on binutils-2_24-branch in git to cab6c3ee9785f072a373afe31253df0451db93cf. --- cross-binutils.spec | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) (limited to 'cross-binutils.spec') diff --git a/cross-binutils.spec b/cross-binutils.spec index dad4612..e18e51d 100644 --- a/cross-binutils.spec +++ b/cross-binutils.spec @@ -47,7 +47,7 @@ Summary: A GNU collection of cross-compilation binary utilities Name: %{cross}-binutils Version: 2.24 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv3+ Group: Development/Tools URL: http://sources.redhat.com/binutils @@ -58,6 +58,10 @@ URL: http://sources.redhat.com/binutils Source: http://ftp.gnu.org/gnu/binutils/binutils-2.24.tar.bz2 Source2: binutils-2.19.50.0.1-output-format.sed + +# Bring up to date with what's in the git release branch +Patch00: binutils-2.24-cab6c3ee9785f072a373afe31253df0451db93cf.patch + Patch01: binutils-2.20.51.0.2-libtool-lib64.patch Patch02: binutils-2.20.51.0.10-ppc64-pie.patch Patch03: binutils-2.20.51.0.2-ia64-lib64.patch @@ -82,9 +86,16 @@ Patch14: binutils-2.24-s390-mkopc.patch Patch15: binutils-2.24-elfnn-aarch64.patch # Fix decoding of abstract instance names using DW_FORM_ref_addr. Patch16: binutils-2.24-DW_FORM_ref_addr.patch +# Fix compiling using gcc 4.9 +Patch17: binutils-2.24-set-section-macros.patch +# Fix detections of uncompressed .debug_str sections that look like they have been compressed. +Patch18: binutils-2.24-fake-zlib-sections.patch +# Fix detections little endian PPC shared libraries +Patch19: binutils-2.24-ldforcele.patch # Fix formatless sprintfs in Score-specific code. Patch100: cross-binutils-2.24-score-sprintf.patch +Patch101: binutils-2.24-kernel-ld-r-fix.patch Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: texinfo >= 4.0, gettext, flex, bison, zlib-devel @@ -191,6 +202,7 @@ Cross-build binary image generation, manipulation and query tools. \ %define srcdir binutils-%{version} %setup -q -n %{srcdir} -c cd %{srcdir} +%patch00 -p1 -b .latest-git~ %patch01 -p0 -b .libtool-lib64~ %patch02 -p0 -b .ppc64-pie~ %ifarch ia64 @@ -211,10 +223,14 @@ cd %{srcdir} %patch12 -p0 -b .kernel-ld-r~ %patch13 -p0 -b .aarch64~ %patch14 -p0 -b .mkopc~ -%patch15 -p0 -b .elf-aarch64~ +#%patch15 -p0 -b .elf-aarch64~ %patch16 -p0 -b .ref-addr~ +%patch17 -p0 -b .sec-macros~ +%patch18 -p0 -b .fake-zlib~ +%patch19 -p0 -b .ldforcele~ %patch100 -p1 -b .score~ +%patch101 -p0 -b .kernel-ld-r-fix~ # We cannot run autotools as there is an exact requirement of autoconf-2.59. @@ -660,8 +676,9 @@ rm -rf %{buildroot} %do_files xtensa-linux-gnu %{build_xtensa} %changelog -* Sat Jun 07 2014 Fedora Release Engineering - 2.24-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild +* Wed Jun 11 2014 David Howells - 2.24-4 +- Sync with binutils-2.24-15 fixing the bfd_set_section_alignment() error [BZ 1106093] +- Apply the changes on binutils-2_24-branch in git to cab6c3ee9785f072a373afe31253df0451db93cf. * Fri Mar 28 2014 David Howells - 2.24-2 - A sysroot of / is bad, so make it /usr//sys-root/. -- cgit