X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=binutils.spec;h=5fc59affeb3ffae39998bf6addbd7dc783542646;hb=f0855b7526f16dbf20710791f149dc7e6e82d349;hp=20a008f58dc44c71c22886dbac562cbb81aa0c90;hpb=2a85ff93a8f0618b3208c0910c83dc22a22dde14;p=packages%2Fbinutils.git

diff --git a/binutils.spec b/binutils.spec
index 20a008f..5fc59af 100644
--- a/binutils.spec
+++ b/binutils.spec
@@ -2,13 +2,9 @@
 # Conditional build:
 %bcond_with	allarchs	# enable all targets
 # define addtargets x,y,z	# build with additional targets x,y,z (e.g. x86_64-linux)
-%bcond_with	gold		# enable gold (gnu ld successor) on supported archs (x86/sparc)
 				# http://sourceware.org/ml/binutils/2008-03/msg00162.html
 %bcond_without	pax		# without PaX flags (for upstream bugreports)
-#
-%ifnarch %{ix86} %{x8664} sparc sparc64 ppc ppc64
-%undefine	with_gold
-%endif
+%bcond_without	default_ld	# default ld instead of gold
 #
 Summary:	GNU Binary Utility Development Utilities
 Summary(de.UTF-8):	GNU Binary Utility Development Utilities
@@ -20,34 +16,32 @@ Summary(ru.UTF-8):	Набор инструментов GNU для построе
 Summary(tr.UTF-8):	GNU geliştirme araçları
 Summary(uk.UTF-8):	Набір інструментів GNU для побудови виконуваних програм
 Name:		binutils
-Version:	2.20.51.0.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:	b01b185a5eab43190fb83efaeb2ffef9
+# 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
 Patch1:		%{name}-info.patch
 Patch2:		%{name}-libtool-relink.patch
 Patch3:		%{name}-pt_pax_flags.patch
-Patch5:		%{name}-flex.patch
-Patch6:		%{name}-discarded.patch
-Patch7:		%{name}-absolute-gnu_debuglink-path.patch
-Patch8:		%{name}-libtool-m.patch
-Patch9:		%{name}-build-id.patch
-Patch10:	%{name}-tooldir.patch
+Patch5:		%{name}-discarded.patch
+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
 BuildRequires:	bison
 BuildRequires:	flex
 BuildRequires:	gettext-devel
-%if %{with gold}
 BuildRequires:	libstdc++-devel >= 6:4.0-1
-%endif
 BuildRequires:	perl-tools-pod
 %ifarch sparc sparc32
 BuildRequires:	sparc32
@@ -55,6 +49,7 @@ BuildRequires:	sparc32
 BuildRequires:	texinfo >= 4.2
 Conflicts:	gcc-c++ < 5:3.3
 Conflicts:	modutils < 2.4.17
+Obsoletes:	binutils-gold
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -158,12 +153,12 @@ niektórych pakietów.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-%patch8 -p1
+%patch8 -p0
 %patch9 -p1
 %patch10 -p1
 
 # file contains hacks for ac 2.59 only
-rm config/override.m4
+%{__rm} config/override.m4
 
 %build
 %{__aclocal}
@@ -196,7 +191,9 @@ TARGETS=sparc64-linux
 
 cp -f /usr/share/automake/config.* .
 CFLAGS="%{rpmcflags}"; export CFLAGS
+CXXFLAGS="%{rpmcxxflags}"; export CXXFLAGS
 CC="%{__cc}"; export CC
+CXX="%{__cxx}"; export CXX
 %ifarch sparc
 sparc32 \
 %endif
@@ -217,7 +214,9 @@ sparc32 \
 	%{?with_allarchs:--enable-64-bit-bfd} \
 %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} \
-	%{?with_gold:--enable-gold}
+%ifarch %{ix86} %{x8664}
+	--enable-gold%{!?with_default_ld:=default} --enable-ld%{?with_default_ld:=default} \
+%endif
 
 %{__make}
 
@@ -227,11 +226,11 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-rm $RPM_BUILD_ROOT%{_infodir}/standards.info*
+%{__rm} $RPM_BUILD_ROOT%{_infodir}/standards.info*
 
 # remove these man pages unless we cross-build for win*/netware platforms.
 # however, this should be done in Makefiles.
-rm $RPM_BUILD_ROOT%{_mandir}/man1/{dlltool,nlmconv,windres}.1
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/{dlltool,nlmconv,windres}.1
 
 bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
 
@@ -241,6 +240,8 @@ install libiberty/pic/libiberty.a $RPM_BUILD_ROOT%{_libdir}
 # remove evil -L pointing inside builder's home
 perl -pi -e 's@-L[^ ]*/pic @@g' $RPM_BUILD_ROOT%{_libdir}/libbfd.la
 
+[ -x $RPM_BUILD_ROOT%{_bindir}/ld.bfd ] || ln $RPM_BUILD_ROOT%{_bindir}/ld{,.bfd}
+
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
 %find_lang bfd
@@ -248,12 +249,15 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 %find_lang gas
 %find_lang gprof
 touch ld.lang
-%if %{without gold}
 %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 >> %{name}.lang
+cat gas.lang gprof.lang ld.lang gold.lang >> %{name}.lang
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -276,16 +280,31 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc README
-%attr(755,root,root) %{_bindir}/[!g]*
-%attr(755,root,root) %{_bindir}/g[!a]*
+%attr(755,root,root) %{_bindir}/addr2line
+%attr(755,root,root) %{_bindir}/ar
+%attr(755,root,root) %{_bindir}/as
+%attr(755,root,root) %{_bindir}/c++filt
+%attr(755,root,root) %{_bindir}/elfedit
+%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
+%attr(755,root,root) %{_bindir}/ranlib
+%attr(755,root,root) %{_bindir}/readelf
+%attr(755,root,root) %{_bindir}/size
+%attr(755,root,root) %{_bindir}/strings
+%attr(755,root,root) %{_bindir}/strip
 %{_infodir}/as.info*
 %{_infodir}/binutils.info*
 %{_infodir}/configure.info*
 %{_infodir}/gprof.info*
-%if %{without gold}
 %{_infodir}/ld.info*
 %{_prefix}/lib/ldscripts
-%endif
 %{_mandir}/man1/*
 %lang(cs) %{_mandir}/cs/man1/*
 %lang(de) %{_mandir}/de/man1/*
@@ -308,7 +327,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libbfd.la
 %{_libdir}/libopcodes.la
 %{_libdir}/libiberty.a
-%{_includedir}/*.h
+%{_includedir}/ansidecl.h
+%{_includedir}/bfd.h
+%{_includedir}/bfdlink.h
+%{_includedir}/dis-asm.h
+%{_includedir}/libiberty.h
+%{_includedir}/symcat.h
 %{_infodir}/bfd.info*
 
 %files static