X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=binutils.spec;h=b950810288a128e95b05a4351f8d3d2984c5a327;hb=461931c7a11963fc886507ab9d0031a84294f6e7;hp=2fcdc1895157d0995d1d0239631e0a3a83aad7cc;hpb=7e53bd795cf1deb58abe5829d4a9553f9262ba48;p=packages%2Fbinutils.git diff --git a/binutils.spec b/binutils.spec index 2fcdc18..b950810 100644 --- a/binutils.spec +++ b/binutils.spec @@ -3,8 +3,8 @@ %bcond_with allarchs # enable all targets # 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 gold # don't build gold (no C++ dependencies) %bcond_without pax # without PaX flags (for upstream bugreports) +%bcond_with default_ld # default ld instead of gold # Summary: GNU Binary Utility Development Utilities Summary(de.UTF-8): GNU Binary Utility Development Utilities @@ -16,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.20.51.0.9 +Version: 2.21.53.0.2 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: 991da49cc5f8a3d13de02ab166be6ec6 +# Source0-md5: c6868a0e6d0ab7a6cdf30bb0bd32476d 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 @@ -40,7 +40,7 @@ BuildRequires: automake >= 1:1.11 BuildRequires: bison BuildRequires: flex BuildRequires: gettext-devel -%{?with_gold:BuildRequires: libstdc++-devel >= 6:4.0-1} +BuildRequires: libstdc++-devel >= 6:4.0-1 BuildRequires: perl-tools-pod %ifarch sparc sparc32 BuildRequires: sparc32 @@ -48,6 +48,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 @@ -120,6 +121,7 @@ Summary: GNU binutils static libraries Summary(pl.UTF-8): Biblioteki statyczne do GNU binutils Group: Development/Libraries Requires: %{name}-devel = %{epoch}:%{version}-%{release} +#Requires: zlib-static %description static Static GNU binutils libraries (libbfd, libopcodes). @@ -142,42 +144,6 @@ GASP - stary preprocesor dla programów w asemblerze. Jest oficjalnie uznany za przestarzały, ale jest nadal potrzebny do zbudowania niektórych pakietów. -%package gold -Summary: GOLD - new version of ELF linker originally developed at Google -Summary(pl.UTF-8): GOLD - nowa wersja linkera ELF powstała w Google -Group: Development/Tools -Requires: %{name} = %{epoch}:%{version}-%{release} - -%description gold -gold is an ELF linker. It is intended to have complete support for ELF -and to run as fast as possible on modern systems. For normal use it is -a drop-in replacement for the older GNU linker. gold was originally -developed at Google, and was contributed to the Free Software -Foundation in March 2008. - -gold supports most of the features of the GNU linker for ELF targets. -Notable omissions - features of the GNU linker not currently supported -in gold - are: - - MEMORY regions in linker scripts - - MRI compatible linker scripts - - cross-reference reports (--cref) - - various other minor options. - -%description gold -l pl.UTF-8 -gold to linker dla plików ELF. Powstał z myślą o pełnej obsłudze -formatu ELF i jak najszybszym działaniu na współczesnych systemach. -Przy zwykłym użyciu jest zamiennikiem starszego linkera GNU. gold -początkowo był rozwijany przez Google i został przekazany Free -Software Foundation w marcu 2008. - -gold obsługuje większość funkcji linkera GNU dla plików ELF. Istotne -braki - możliwości linkera GNU aktualnie nie obsługiwane przez gold - -to: -- regiony typu MEMORY w skryptach linkera -- skrypty linkera kompatybilne z MRI -- raporty odsyłaczy (--cref) -- kilka innych, mniej istotnych opcji. - %prep %setup -q %patch0 -p1 @@ -187,11 +153,11 @@ to: %patch5 -p1 %patch6 -p1 %patch7 -p1 -%patch8 -p1 +%patch8 -p0 %patch9 -p1 # file contains hacks for ac 2.59 only -rm config/override.m4 +%{__rm} config/override.m4 %build %{__aclocal} @@ -224,7 +190,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 @@ -233,6 +201,8 @@ sparc32 \ --disable-werror \ --enable-build-warnings=,-Wno-missing-prototypes \ --enable-shared \ + --enable-lto \ + --enable-plugins \ --prefix=%{_prefix} \ --libdir=%{_libdir} \ --infodir=%{_infodir} \ @@ -245,10 +215,8 @@ 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} \ -%if %{with gold} - --enable-gold=both/ld -%else - --disable-gold +%ifarch %{ix86} %{x8664} + --enable-gold%{!?with_default_ld:=default} --enable-ld%{?with_default_ld:=default} \ %endif %{__make} @@ -259,11 +227,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} @@ -283,12 +251,14 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/dir %find_lang gprof touch ld.lang %find_lang ld -%if %{with gold} +%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 @@ -319,6 +289,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 @@ -360,6 +333,7 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/bfdlink.h %{_includedir}/dis-asm.h %{_includedir}/libiberty.h +%{_includedir}/plugin-api.h %{_includedir}/symcat.h %{_infodir}/bfd.info* @@ -372,10 +346,3 @@ rm -rf $RPM_BUILD_ROOT %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/gasp %{_infodir}/gasp.info* - -%if %{with gold} -%files gold -f gold.lang -%defattr(644,root,root,755) -%doc gold/{ChangeLog,README,TODO} -%attr(755,root,root) %{_bindir}/ld.gold -%endif