X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=binutils.spec;h=ca2da316d27dcdd495af3775bd70f4e6a94cc1d5;hb=c1ef29843904141ffae16b63f73572d2ae641c14;hp=2b3e6c1d8ecbe6440befe98dda0c178a4c61e418;hpb=3c599410858131c65b1027093f9b1f6ec7a0827c;p=packages%2Fbinutils.git diff --git a/binutils.spec b/binutils.spec index 2b3e6c1..ca2da31 100644 --- a/binutils.spec +++ b/binutils.spec @@ -2,14 +2,17 @@ # 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 +%bcond_without gold # don't build gold (no C++ dependencies) +%bcond_without default_bfd # default ld.bfd instead of gold +%bcond_without gasp # gasp +%bcond_with tests + +%ifnarch %{ix86} %{x8664} x32 %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,42 +23,55 @@ 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.8 -Release: 1 +Version: 2.24.51.0.4 +Release: 2 Epoch: 3 License: GPL v3+ Group: Development/Tools -Source0: ftp://ftp.kernel.org/pub/linux/devel/binutils/%{name}-%{version}.tar.bz2 -# Source0-md5: 32593eddb6a2a370231d64b8c29e0d30 +# Source0: https://www.kernel.org/pub/linux/devel/binutils/%{name}-%{version}.tar.xz + +# release with no tarball - https://sourceware.org/git/?p=binutils-gdb.git;a=summary +Source0: %{name}-%{version}.tar.bz2 +# Source0-md5: a44a86209c84e2072824183c4b0a11f4 + 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 -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}-sanity-check.patch +Patch11: %{name}-am.patch +Patch12: pr-17422.patch +Patch13: pr-17440.patch +Patch14: pr-17447.patch +Patch15: pr-17467.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 +BuildRequires: gettext-tools +%{?with_gold:BuildRequires: libstdc++-devel >= 6:4.0-1} +%{?with_tests:BuildRequires: libstdc++-static >= 6:4.0} BuildRequires: perl-tools-pod %ifarch sparc sparc32 BuildRequires: sparc32 %endif +BuildRequires: tar >= 1:1.22 BuildRequires: texinfo >= 4.2 +BuildRequires: xz +BuildRequires: zlib-devel +%{?with_tests:BuildRequires: zlib-static} Conflicts: gcc-c++ < 5:3.3 Conflicts: modutils < 2.4.17 +Conflicts: rpmbuild(macros) < 1.660 +Obsoletes: binutils-gold BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -128,6 +144,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). @@ -152,20 +169,24 @@ niektórych pakietów. %prep %setup -q -%patch0 -p1 +%{?with_gasp:%patch0 -p1} %patch1 -p1 %patch2 -p1 %{?with_pax:%patch3 -p1} -%patch4 -p0 %patch5 -p1 %patch6 -p1 %patch7 -p1 %patch8 -p1 %patch9 -p1 %patch10 -p1 +%patch11 -p1 +%patch12 -p1 +%patch13 -p1 +%patch14 -p1 +%patch15 -p1 # file contains hacks for ac 2.59 only -rm config/override.m4 +%{__rm} config/override.m4 %build %{__aclocal} @@ -175,10 +196,10 @@ rm config/override.m4 # 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 @@ -194,11 +215,19 @@ TARGETS=x86_64-linux %ifarch sparc TARGETS=sparc64-linux %endif +%ifarch %{x8664} +TARGETS="x86_64-pep" +%endif +%ifarch x32 +TARGETS="x86_64-linux,x86_64-pep" +%endif %{?addtargets:TARGETS="%{addtargets}"} 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 @@ -207,6 +236,9 @@ sparc32 \ --disable-werror \ --enable-build-warnings=,-Wno-missing-prototypes \ --enable-shared \ + --enable-lto \ + --enable-plugins \ + --with-zlib=yes \ --prefix=%{_prefix} \ --libdir=%{_libdir} \ --infodir=%{_infodir} \ @@ -218,10 +250,14 @@ sparc32 \ %else %{?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} + %{?with_allarchs:--enable-targets=alpha-linux,arm-linux,cris-linux,hppa-linux,i386-linux,ia64-linux,x86_64-linux,x86_64-linux-gnux32,m68k-linux,mips-linux,mips64-linux,mips64el-linux,mipsel-linux,ppc-linux,s390-linux,s390x-linux,sh-linux,sparc-linux,sparc64-linux,i386-linuxaout,x86_64-pep} \ +%if %{with gold} + --enable-gold%{!?with_default_bfd:=default} --enable-ld%{?with_default_bfd:=default} \ +%endif -%{__make} +%{__make} -j1 + +%{?with_tests:%{__make} -j1 check} %install rm -rf $RPM_BUILD_ROOT @@ -229,33 +265,34 @@ rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT -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} -install include/libiberty.h $RPM_BUILD_ROOT%{_includedir} -install libiberty/pic/libiberty.a $RPM_BUILD_ROOT%{_libdir} +cp -p include/libiberty.h $RPM_BUILD_ROOT%{_includedir} +cp -p 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 %find_lang binutils %find_lang gas %find_lang gprof -touch ld.lang -%if %{without gold} +touch ld.lang gold.lang %find_lang ld +%if %{with gold} +%find_lang gold %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 @@ -275,19 +312,41 @@ rm -rf $RPM_BUILD_ROOT %postun devel -p /sbin/postshell -/usr/sbin/fix-info-dir -c %{_infodir} +%post gasp -p /sbin/postshell +-/usr/sbin/fix-info-dir -c %{_infodir} + +%postun gasp -p /sbin/postshell +-/usr/sbin/fix-info-dir -c %{_infodir} + %files -f %{name}.lang %defattr(644,root,root,755) %doc README -%attr(755,root,root) %{_bindir}/[!g]* -%attr(755,root,root) %{_bindir}/g[!a]* +%{?with_gold:%doc gold/{ChangeLog,README,TODO}} +%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 +%if %{with gold} +%attr(755,root,root) %{_bindir}/ld.gold +%attr(755,root,root) %{_bindir}/dwp +%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/* @@ -310,7 +369,13 @@ 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}/plugin-api.h +%{_includedir}/symcat.h %{_infodir}/bfd.info* %files static @@ -318,7 +383,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libbfd.a %{_libdir}/libopcodes.a +%if %{with gasp} %files gasp %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/gasp %{_infodir}/gasp.info* +%endif