rpms/binutils
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Remove spurious spaces from binutils.spec

Browse Source
This commit is contained in:
Nick Clifton 2021-05-27 13:06:57 +01:00
parent a4b106ec38
commit 3ebde0f76b
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
binutils.spec
View File

@ -333,7 +333,7 @@ BuildRequires: findutils
# It should not be required for: ld-elf/elf.exp static {preinit,init,fini} array # It should not be required for: ld-elf/elf.exp static {preinit,init,fini} array
%if %{with testsuite} %if %{with testsuite}
# relro_test.sh uses dc which is part of the bc rpm, hence its inclusion here. # relro_test.sh uses dc which is part of the bc rpm, hence its inclusion here.
BuildRequires: dejagnu, zlib-static, glibc-static, sharutils, bc BuildRequires: dejagnu, zlib-static, glibc-static, sharutils, bc, libstdc++
%endif %endif
Requires(post): %{_sbindir}/alternatives Requires(post): %{_sbindir}/alternatives
@ -502,10 +502,9 @@ CARGS=
CARGS="$CARGS --with-debuginfod" CARGS="$CARGS --with-debuginfod"
%endif %endif
case %{binutils_target} in i?86*|sparc*|ppc*|s390*|sh*|arm*|aarch64*|riscv*) %ifarch %{ix86} x86_64 ppc %{power64} s390 s390x sh3 sh4 sparc sparc64 arm
CARGS="$CARGS --enable-64-bit-bfd" CARGS="$CARGS --enable-64-bit-bfd"
;; %endif
esac
# Extra targets to build along with the default one. # Extra targets to build along with the default one.
# #
@ -587,7 +586,7 @@ popd
%endif %endif
%if %{enable_new_dtags} %if %{enable_new_dtags}
--enable-new-dtags \ --enable-new-dtags \
--disable-rpath \ --disable-rpath \
%endif %endif
%if %{default_compress_debug} %if %{default_compress_debug}
--enable-compressed-debug-sections=all \ --enable-compressed-debug-sections=all \
@ -703,10 +702,10 @@ rm -f %{buildroot}%{_libdir}/lib{bfd,opcodes}.so
# Remove libtool files, which reference the .so libs # Remove libtool files, which reference the .so libs
rm -f %{buildroot}%{_libdir}/lib{bfd,opcodes}.la rm -f %{buildroot}%{_libdir}/lib{bfd,opcodes}.la
# Sanity check --enable-64-bit-bfd really works.
grep '^#define BFD_ARCH_SIZE 64$' %{buildroot}%{_prefix}/include/bfd.h
# Fix multilib conflicts of generated values by __WORDSIZE-based expressions. # Fix multilib conflicts of generated values by __WORDSIZE-based expressions.
%ifarch %{ix86} x86_64 ppc %{power64} s390 s390x sh3 sh4 sparc sparc64 arm %ifarch %{ix86} x86_64 ppc %{power64} s390 s390x sh3 sh4 sparc sparc64 arm
# Sanity check --enable-64-bit-bfd really works.
grep '^#define BFD_ARCH_SIZE 64$' %{buildroot}%{_prefix}/include/bfd.h
sed -i -e '/^#include "ansidecl.h"/{p;s~^.*$~#include <bits/wordsize.h>~;}' \ sed -i -e '/^#include "ansidecl.h"/{p;s~^.*$~#include <bits/wordsize.h>~;}' \
-e 's/^#define BFD_DEFAULT_TARGET_SIZE \(32\|64\) *$/#define BFD_DEFAULT_TARGET_SIZE __WORDSIZE/' \ -e 's/^#define BFD_DEFAULT_TARGET_SIZE \(32\|64\) *$/#define BFD_DEFAULT_TARGET_SIZE __WORDSIZE/' \
-e 's/^#define BFD_HOST_64BIT_LONG [01] *$/#define BFD_HOST_64BIT_LONG (__WORDSIZE == 64)/' \ -e 's/^#define BFD_HOST_64BIT_LONG [01] *$/#define BFD_HOST_64BIT_LONG (__WORDSIZE == 64)/' \