X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=binutils.spec;h=9d0b653a024b35391c742779e51b1852a78e8752;hb=da6c5e211f482743bc89b94d7c92ea429b88986b;hp=c3a4a9359bb6cd6089d7c1f04726565d3af511c7;hpb=5be0980748943f4e06056f34f3e0974b92de102c;p=packages%2Fbinutils.git diff --git a/binutils.spec b/binutils.spec index c3a4a93..9d0b653 100644 --- a/binutils.spec +++ b/binutils.spec @@ -2,14 +2,10 @@ # 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 gold # don't build gold (no C++ dependencies) %bcond_without pax # without PaX flags (for upstream bugreports) # -%ifnarch %{ix86} %{x8664} sparc -%undefine with_gold -%endif -# Summary: GNU Binary Utility Development Utilities Summary(de.UTF-8): GNU Binary Utility Development Utilities Summary(es.UTF-8): Utilitarios para desarrollo de binarios de la GNU @@ -20,39 +16,36 @@ Summary(ru.UTF-8): Набор инструментов GNU для построе Summary(tr.UTF-8): GNU geliştirme araçları Summary(uk.UTF-8): Набір інструментів GNU для побудови виконуваних програм Name: binutils -Version: 2.19.51.0.1 +Version: 2.21.51.0.4 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: 5854c8e29f4f588b3689b3c378cf423e +# Source0-md5: 4a462be596b2c4d6b906dff713b7916a 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 -Patch4: %{name}-mips-relocs.patch -Patch5: %{name}-flex.patch -Patch6: %{name}-discarded.patch -Patch7: %{name}-absolute-gnu_debuglink-path.patch -Patch8: %{name}-libtool-m.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 URL: http://sources.redhat.com/binutils/ -BuildRequires: autoconf >= 2.60 -BuildRequires: automake >= 1:1.8.2 +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 +%{?with_gold:BuildRequires: libstdc++-devel >= 6:4.0-1} BuildRequires: perl-tools-pod %ifarch sparc sparc32 BuildRequires: sparc32 %endif BuildRequires: texinfo >= 4.2 -Requires: %{name} = %{epoch}:%{version}-%{release} Conflicts: gcc-c++ < 5:3.3 Conflicts: modutils < 2.4.17 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -149,30 +142,69 @@ 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 %patch1 -p1 %patch2 -p1 %{?with_pax:%patch3 -p1} -%patch4 -p0 %patch5 -p1 %patch6 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 -# hacks for ac 2.59 only -rm config/override.m4 +# file contains hacks for ac 2.59 only +%{__rm} config/override.m4 %build +%{__aclocal} +%{__autoconf} + # non-standard regeneration (needed because of gasp patch) # AM_BINUTILS_WARNINGS in bfd/warning.m4, ZW_GNU_GETTEXT_SISTER_DIR in config/gettext-sister.m4 for dir in gas bfd; do cd $dir || exit 1 - aclocal -I .. -I ../config -I ../bfd - automake --cygnus Makefile - automake --cygnus doc/Makefile - autoconf + %{__aclocal} -I .. -I ../config -I ../bfd + %{__automake} Makefile + %{__automake} doc/Makefile + %{__autoconf} cd .. done @@ -191,8 +223,10 @@ TARGETS=sparc64-linux %{?addtargets:TARGETS="%{addtargets}"} cp -f /usr/share/automake/config.* . -CFLAGS="%{rpmcflags} -fno-strict-aliasing"; export CFLAGS +CFLAGS="%{rpmcflags}"; export CFLAGS +CXXFLAGS="%{rpmcxxflags}"; export CXXFLAGS CC="%{__cc}"; export CC +CXX="%{__cxx}"; export CXX %ifarch sparc sparc32 \ %endif @@ -205,6 +239,7 @@ sparc32 \ --libdir=%{_libdir} \ --infodir=%{_infodir} \ --mandir=%{_mandir} \ + --with-tooldir=%{_prefix} \ %{!?with_allarchs:`[ -n "${TARGETS}" ] && echo "--enable-targets=${TARGETS}"`} \ %ifarch sparc --enable-64-bit-bfd \ @@ -212,29 +247,25 @@ 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} +%if %{with gold} + --enable-gold +%else + --disable-gold +%endif -%{__make} -j1 configure-bfd -%{__make} -j1 headers -C bfd -%{__make} -j1 all info \ - tooldir=%{_prefix} +%{__make} %install rm -rf $RPM_BUILD_ROOT -%{__make} -j1 install \ - prefix=$RPM_BUILD_ROOT%{_prefix} \ - tooldir=$RPM_BUILD_ROOT%{_prefix} \ - mandir=$RPM_BUILD_ROOT%{_mandir} \ - infodir=$RPM_BUILD_ROOT%{_infodir} \ - includedir=$RPM_BUILD_ROOT%{_includedir} \ - libdir=$RPM_BUILD_ROOT%{_libdir} +%{__make} install \ + DESTDIR=$RPM_BUILD_ROOT -rm -f $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 -f $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} @@ -244,6 +275,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 @@ -251,8 +284,9 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/dir %find_lang gas %find_lang gprof touch ld.lang -%if %{without gold} %find_lang ld +%if %{with gold} +%find_lang gold %endif %find_lang opcodes cat bfd.lang opcodes.lang > %{name}-libs.lang @@ -279,16 +313,28 @@ 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 +%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/* @@ -311,7 +357,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 @@ -323,3 +374,10 @@ 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