- fix --start/end-group vs. --whole-archive gold failure.

[packages/binutils.git] / binutils.spec

diff --git a/binutils.spec b/binutils.spec
index 301862932207c1c94771d3689962c23a437bf85a..5fc59affeb3ffae39998bf6addbd7dc783542646 100644 (file)
--- a/binutils.spec
+++ b/binutils.spec
@@ -4,6 +4,7 @@
 # define addtargets x,y,z      # build with additional targets x,y,z (e.g. x86_64-linux)
                                # http://sourceware.org/ml/binutils/2008-03/msg00162.html
 %bcond_without pax             # without PaX flags (for upstream bugreports)
+%bcond_without default_ld      # default ld instead of gold
 #
 Summary:       GNU Binary Utility Development Utilities
 Summary(de.UTF-8):     GNU Binary Utility Development Utilities
@@ -15,13 +16,13 @@ Summary(ru.UTF-8):  Набор инструментов GNU для построе
 Summary(tr.UTF-8):     GNU geliştirme araçları
 Summary(uk.UTF-8):     Набір інструментів GNU для побудови виконуваних програм
 Name:          binutils
-Version:       2.21.51.0.7
-Release:       2
+Version:       2.21.51.0.9
+Release:       1
 Epoch:         3
 License:       GPL v3+
 Group:         Development/Tools
 Source0:       ftp://ftp.kernel.org/pub/linux/devel/binutils/%{name}-%{version}.tar.bz2
-# Source0-md5: 48c5538816ca7dd9774cac2acd2b4707
+# Source0-md5: 2ac3a7dae9f177f2b29f4ef1852c27a8
 Source1:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5: a717d9707ec77d82acb6ec9078c472d6
 Patch0:                %{name}-gasp.patch
@@ -33,6 +34,7 @@ Patch6:               %{name}-absolute-gnu_debuglink-path.patch
 Patch7:                %{name}-libtool-m.patch
 Patch8:                %{name}-build-id.patch
 Patch9:                %{name}-tooldir.patch
+Patch10:       %{name}-pr12163.patch
 URL:           http://sources.redhat.com/binutils/
 BuildRequires: autoconf >= 2.64
 BuildRequires: automake >= 1:1.11
@@ -153,6 +155,7 @@ niektórych pakietów.
 %patch7 -p1
 %patch8 -p0
 %patch9 -p1
+%patch10 -p1
 
 # file contains hacks for ac 2.59 only
 %{__rm} config/override.m4
@@ -212,7 +215,7 @@ sparc32 \
 %endif
        %{?with_allarchs:--enable-targets=alpha-linux,arm-linux,cris-linux,hppa-linux,i386-linux,ia64-linux,x86_64-linux,m68k-linux,mips-linux,mips64-linux,mips64el-linux,mipsel-linux,ppc-linux,s390-linux,s390x-linux,sh-linux,sparc-linux,sparc64-linux,i386-linuxaout} \
 %ifarch %{ix86} %{x8664}
-       --enable-gold=default --enable-ld \
+       --enable-gold%{!?with_default_ld:=default} --enable-ld%{?with_default_ld:=default} \
 %endif
 
 %{__make}
@@ -247,7 +250,11 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 %find_lang gprof
 touch ld.lang
 %find_lang ld
+%ifarch %{ix86} %{x8664}
 %find_lang gold
+%else
+:> gold.lang
+%endif
 %find_lang opcodes
 cat bfd.lang opcodes.lang > %{name}-libs.lang
 cat gas.lang gprof.lang ld.lang gold.lang >> %{name}.lang
@@ -281,7 +288,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/gprof
 %attr(755,root,root) %{_bindir}/ld
 %attr(755,root,root) %{_bindir}/ld.bfd
+%ifarch %{ix86} %{x8664}
 %attr(755,root,root) %{_bindir}/ld.gold
+%endif
 %attr(755,root,root) %{_bindir}/nm
 %attr(755,root,root) %{_bindir}/objcopy
 %attr(755,root,root) %{_bindir}/objdump