Changeset 771 for spec/trunk/SPECS/binutils.spec

Timestamp:

Jun 1, 2016, 2:08:45 PM (9 years ago)

Author:

Silvan Scherrer

Message:

spec: binutils: updated to version 2.25

File:

• spec/trunk/SPECS/binutils.spec (modified) (9 diffs)

spec/trunk/SPECS/binutils.spec

@@ -1 @@
-#disable lxlite strip
-%define __os_install_post       %{nil}
+%define svn_url     e:/trees/binutils/trunk
+#define svn_url     http://svn.netlabs.org/repos/ports/binutils/trunk
+#define svn_rev     1585
 
 # rpmbuild parameters:
@@ -8 +9 @@
 # --with testsuite: Run the testsuite.  Default --with debug is not to run it.
 
-%bcond_with testsuite
+# we don't run the testsuit, as there are dependencies we don't have atm
+%define _without_testsuite 1
 
 %if 0%{!?binutils_target:1}
-%define binutils_target %{_target_platform}
+# we always use _build, as target_platform isn't recognised by configure
+# define binutils_target %{_target_platform}
+%define binutils_target %{_build}
 %define isnative 1
 %define enable_shared 1
@@ -19 +23 @@
 %define enable_shared 0
 %endif
+# BZ 1124342: Provide a way to enable deterministic archives.
+# BZ 1195883: But do not do this by default.
+%define enable_deterministic_archives 0
+
 
 Summary: A GNU collection of binary utilities
 Name: %{?cross}binutils%{?_with_debug:-debug}
-Version: 2.21
+Version: 2.25
 Release: 1%{?dist}
 License: GPLv3+
 Group: Development/Tools
 URL: http://sources.redhat.com/binutils
-Source: binutils-2.21-os2-20101212.zip
-
-%define gold_arches %ix86 x86_64
-
-%ifarch %gold_arches
-%define build_gold      both
-%else
+
+Source: %{name}-%{version}%{?svn_rev:-r%{svn_rev}}.zip
+Vendor: bww bitwise works GmbH
+
+Provides: bundled(libiberty)
+
+# BZ 1173780: Building GOLD for PPC is not working at the moment.
+# define gold_arches %ix86 x86_64 %arm aarch64 ppc* %{power64}
+%define gold_arches %ix86 x86_64 %arm aarch64
+
+# we don't build on elf, so no gold for us
+# ifarch %gold_arches
+# define build_gold     both
+# else
 %define build_gold      no
-%endif
+# endif
 
 %if 0%{?_with_debug:1}
@@ -47 +62 @@
 %endif
 
-#Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-#BuildRequires: texinfo >= 4.0, gettext, flex, bison, zlib-devel
-
+BuildRequires: texinfo >= 4.0, gettext, flex, bison, zlib-devel
+# BZ 920545: We need pod2man in order to build the manual pages.
+# BuildRequires: /@unixroot/usr/bin/pod2man
 # Required for: ld-bootstrap/bootstrap.exp bootstrap with --static
 # It should not be required for: ld-elf/elf.exp static {preinit,init,fini} array
 %if %{run_testsuite}
-#BuildRequires: dejagnu, zlib-static, glibc-static, sharutils
-%endif
-
+# relro_test.sh uses dc which is part of the bc rpm, hence its inclusion here.
+BuildRequires: dejagnu, zlib-static, glibc-static, sharutils, bc
+%if "%{build_gold}" == "both"
+# The GOLD testsuite needs a static libc++
+BuildRequires: libstdc++-static
+%endif
+%endif
 Conflicts: gcc-c++ < 4.0.0
 #Requires(post): /sbin/install-info
@@ -63 +82 @@
 %endif
 
+
 # The higher of these two numbers determines the default ld.
 %{!?ld_bfd_priority: %define ld_bfd_priority    50}
@@ -68 +88 @@
 
 %if "%{build_gold}" == "both"
-#Requires(post): coreutils
-#Requires(post): %{_sbindir}/alternatives
-#Requires(preun): %{_sbindir}/alternatives
+Requires(post): coreutils
+Requires(post): %{_sbindir}/alternatives
+Requires(preun): %{_sbindir}/alternatives
 %endif
 
@@ -95 +115 @@
 Summary: BFD and opcodes dynamic libraries and header files
 Group: System Environment/Libraries
-#Conflicts: binutils < 2.17.50.0.3-4
+Conflicts: binutils < 2.17.50.0.3-4
 #Requires(post): /sbin/install-info
 #Requires(preun): /sbin/install-info
 Requires: zlib-devel
+Requires: binutils = %{version}-%{release}
+# BZ 1215242: We need touch...
+Requires: coreutils
 
 %description devel
-This package contains the generic BFD and opcodes dynamic libraries and
-associated header files.  Developers starting new projects are encouraged
-to consider using libelf instead of BFD.
-
-%package static
-Summary: BFD and opcodes static libraries
-Group: System Environment/Libraries
-#Requires(post): /sbin/install-info
-#Requires(preun): /sbin/install-info
-
-%description static
-This package contains BFD and opcodes static libraries.  Developers
-starting new projects are strongly encouraged to consider using
-libelf instead of BFD.
+This package contains BFD and opcodes static and dynamic libraries.
+
+The dynamic libraries are in this package, rather than a seperate
+base package because they are actually linker scripts that force
+the use of the static libraries.  This is because the API of the
+BFD library is too unstable to be used dynamically.
+
+The static libraries are here because they are now needed by the
+dynamic libraries.
+
+Developers starting new projects are strongly encouraged to consider
+using libelf instead of BFD.
+
 
 %prep
-%setup -q -c
+%if %{?svn_rev:%(sh -c 'if test -f "%{_sourcedir}/%{name}-%{version}-r%{svn_rev}.zip" ; then echo 1 ; else echo 0 ; fi')}%{!?svn_rev):0}
+%setup -q
+%else
+%setup -n "%{name}-%{version}" -Tc
+svn export %{?svn_rev:-r %{svn_rev}} %{svn_url} . --force
+rm -f "%{_sourcedir}/%{name}-%{version}%{?svn_rev:-r%{svn_rev}}.zip"
+(cd .. && zip -SrX9 "%{_sourcedir}/%{name}-%{version}%{?svn_rev:-r%{svn_rev}}.zip" "%{name}-%{version}")
+%endif
+
+autogen.sh
 
 %build
+echo target is %{binutils_target}
+%ifarch %{power64}
+export CFLAGS="$RPM_OPT_FLAGS -Wno-error"
+%else
+export CFLAGS="$RPM_OPT_FLAGS"
+%endif
+CARGS=
+
+case %{binutils_target} in i?86*|sparc*|ppc*|s390*|sh*|arm*|aarch64*)
+  CARGS="$CARGS --enable-64-bit-bfd"
+  ;;
+esac
+
+case %{binutils_target} in ia64*)
+  CARGS="$CARGS --enable-targets=i386-linux"
+  ;;
+esac
+
+case %{binutils_target} in ppc*|ppc64*)
+  CARGS="$CARGS --enable-targets=spu"
+  ;;
+esac
+
+case %{binutils_target} in ppc64-*)
+  CARGS="$CARGS --enable-targets=powerpc64le-linux"
+  ;;
+esac
+
+case %{binutils_target} in  ppc64le*)
+    CARGS="$CARGS --enable-targets=powerpc-linux"
+    ;;
+esac
+
+%if 0%{?_with_debug:1}
+CFLAGS="$CFLAGS -O0 -ggdb2 -Wno-error -D_FORTIFY_SOURCE=0"
+%define enable_shared 0
+%endif
+
+export LDFLAGS=" -Zhigh-mem -Zomf -Zargs-wild -Zargs-resp"
+
+# We could optimize the cross builds size by --enable-shared but the produced
+# binaries may be less convenient in the embedded environment.
+# the below configure switchs we don't use
+#  --build=%{_target_platform} --host=%{_target_platform} \
+%configure \
+  --target=%{binutils_target} \
+%ifarch %gold_arches
+%if "%{build_gold}" == "both"
+  --enable-gold=default --enable-ld \
+%else
+  --enable-ld \
+%endif
+%endif
+%if !%{isnative}
+  --enable-targets=%{_host} \
+  --with-sysroot=%{_prefix}/%{binutils_target}/sys-root \
+  --program-prefix=%{cross} \
+%endif
+%if %{enable_shared}
+  --enable-shared --disable-static \
+%else
+  --disable-shared \
+%endif
+%if %{enable_deterministic_archives}
+  --enable-deterministic-archives \
+%else    
+  --enable-deterministic-archives=no \
+%endif
+  $CARGS \
+  --enable-plugins \
+  --with-bugurl=http://bugzilla.redhat.com/bugzilla/
+make %{_smp_mflags} tooldir=%{_prefix} all
+make %{_smp_mflags} tooldir=%{_prefix} info
+
+# Do not use %%check as it is run after %%install where libbfd.so is rebuild
+# with -fvisibility=hidden no longer being usable in its shared form.
+%if !%{run_testsuite}
+echo ====================TESTSUITE DISABLED=========================
+%else
+make -k check < /dev/null || :
+echo ====================TESTING=========================
+cat {gas/testsuite/gas,ld/ld,binutils/binutils}.sum
+echo ====================TESTING END=====================
+for file in {gas/testsuite/gas,ld/ld,binutils/binutils}.{sum,log}
+do
+  ln $file binutils-%{_target_platform}-$(basename $file) || :
+done
+tar cjf binutils-%{_target_platform}.tar.bz2 binutils-%{_target_platform}-*.{sum,log}
+uuencode binutils-%{_target_platform}.tar.bz2 binutils-%{_target_platform}.tar.bz2
+rm -f binutils-%{_target_platform}.tar.bz2 binutils-%{_target_platform}-*.{sum,log}
+%endif
 
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}%{_usr}
-cp -p -r "binutils/*" %{buildroot}%{_usr}
-
-rm  %{buildroot}%{_libdir}/*.la
-rm  %{buildroot}%{_usr}/readme.os2
-rm  %{buildroot}%{_infodir}/dir
+make install DESTDIR=%{buildroot}
+%if %{isnative}
+make prefix=%{buildroot}%{_prefix} infodir=%{buildroot}%{_infodir} install-info
+
+#install -m 644 bfd/libbfd.a %{buildroot}%{_libdir}
+#install -m 644 libiberty/libiberty.a %{buildroot}%{_libdir}
+install -m 644 include/libiberty.h %{buildroot}%{_prefix}/include
+#install -m 644 opcodes/libopcodes.a %{buildroot}%{_libdir}
+# Remove Windows/Novell only man pages
+rm -f %{buildroot}%{_mandir}/man1/{dlltool,nlmconv,windres,windmc}*
+
+%if %{enable_shared}
+chmod +x %{buildroot}%{_libdir}/*.dll
+%endif
+
+# Remove libtool files, which reference the .dll libs
+rm -f %{buildroot}%{_libdir}/*.la
+
+%else # !%{isnative}
+# For cross-binutils we drop the documentation.
+rm -rf %{buildroot}%{_infodir}
+# We keep these as one can have native + cross binutils of different versions.
+#rm -rf %{buildroot}%{_prefix}/share/locale
+#rm -rf %{buildroot}%{_mandir}
+rm -rf %{buildroot}%{_libdir}/libiberty.a
+%endif # !%{isnative}
+
+# This one comes from gcc
+rm -f %{buildroot}%{_infodir}/dir
+rm -rf %{buildroot}%{_prefix}/%{binutils_target}
+
+%find_lang %{?cross}binutils
+%find_lang %{?cross}opcodes
+%find_lang %{?cross}bfd
+%find_lang %{?cross}gas
+%find_lang %{?cross}gprof
+cat %{?cross}opcodes.lang >> %{?cross}binutils.lang
+cat %{?cross}bfd.lang >> %{?cross}binutils.lang
+cat %{?cross}gas.lang >> %{?cross}binutils.lang
+cat %{?cross}gprof.lang >> %{?cross}binutils.lang
+
+if [ -x ld/ld-new ]; then
+  %find_lang %{?cross}ld
+  cat %{?cross}ld.lang >> %{?cross}binutils.lang
+fi
+if [ -x gold/ld-new ]; then
+  %find_lang %{?cross}gold
+  cat %{?cross}gold.lang >> %{?cross}binutils.lang
+fi
 
 %clean
@@ -134 +299 @@
 
 %post
+%if "%{build_gold}" == "both"
+%__rm -f %{_bindir}/%{?cross}ld
+%{_sbindir}/alternatives --install %{_bindir}/%{?cross}ld %{?cross}ld \
+  %{_bindir}/%{?cross}ld.bfd %{ld_bfd_priority}
+%{_sbindir}/alternatives --install %{_bindir}/%{?cross}ld %{?cross}ld \
+  %{_bindir}/%{?cross}ld.gold %{ld_gold_priority}
+%{_sbindir}/alternatives --auto %{?cross}ld 
+%endif
+%if %{isnative}
+#/sbin/ldconfig
+# For --excludedocs:
+if [ -e %{_infodir}/binutils.info.gz ]
+then
+  %{_sbindir}/install-info --info-dir=%{_infodir} %{_infodir}/as.info.gz
+  %{_sbindir}/install-info --info-dir=%{_infodir} %{_infodir}/binutils.info.gz
+  %{_sbindir}/install-info --info-dir=%{_infodir} %{_infodir}/gprof.info.gz
+  %{_sbindir}/install-info --info-dir=%{_infodir} %{_infodir}/ld.info.gz
+fi
+%endif # %{isnative}
+exit 0
 
 %preun
-
-%files
+%if "%{build_gold}" == "both"
+if [ $1 = 0 ]; then
+  %{_sbindir}/alternatives --remove %{?cross}ld %{_bindir}/%{?cross}ld.bfd
+  %{_sbindir}/alternatives --remove %{?cross}ld %{_bindir}/%{?cross}ld.gold
+fi
+%endif
+%if %{isnative}
+if [ $1 = 0 ]; then
+  if [ -e %{_infodir}/binutils.info.gz ]
+  then
+   %{_sbindir}/install-info --delete --info-dir=%{_infodir} %{_infodir}/as.info.gz
+   %{_sbindir}/install-info --delete --info-dir=%{_infodir} %{_infodir}/binutils.info.gz
+   %{_sbindir}/install-info --delete --info-dir=%{_infodir} %{_infodir}/gprof.info.gz
+   %{_sbindir}/install-info --delete --info-dir=%{_infodir} %{_infodir}/ld.info.gz
+  fi
+fi
+%endif
+exit 0
+
+%if %{isnative}
+#%postun -p /sbin/ldconfig
+%endif # %{isnative}
+
+%files -f %{?cross}binutils.lang
 %defattr(-,root,root,-)
-%doc binutils/readme.os2
-%{_bindir}/*
-%{_usr}/i386-pc-os2-emx/*
+%doc README
+%{_bindir}/%{?cross}[!l]*
+%if "%{build_gold}" == "both"
+%{_bindir}/%{?cross}ld.*
+%ghost %{_bindir}/%{?cross}ld
+%else
+#%{_bindir}/%{?cross}ld*
+%endif
 %{_mandir}/man1/*
+%if %{enable_shared}
+%{_libdir}/*.dll
+%endif
+
+%if %{isnative}
 %{_infodir}/[^b]*info*
 %{_infodir}/binutils*info*
@@ -148 +365 @@
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/*
+%{_prefix}/include/*
+%{_libdir}/*_dll.a
 %{_infodir}/bfd*info*
 
-%files static
-%defattr(-,root,root,-)
-%{_libdir}/*.a
+%endif # %{isnative}
 
 %changelog
+* Tue May 31 2016 Silvan Scherrer <silvan.scherrer@aroa.ch> 2.25-1
+- update to version 2.25
+
+* Wed Oct 5 2011 yd <yd@os2power.com> 2.21-1
+- Initial version