Accepting request 979157 from devel:gcc

- Use https for variosu links.

- Update binutils-2.38-branch.diff.gz (to 93054037f1e304e)
  in order to include PR29087.

- Enable multitarget build on riscv64
- On SLE15 and later, use make -Oline to synchronize configure output by
  lines

OBS-URL: https://build.opensuse.org/request/show/979157
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/binutils?expand=0&rev=158
This commit is contained in:
Dominique Leuenberger 2022-05-27 22:28:03 +00:00 committed by Git OBS Bridge
commit 3b387fedf9
3 changed files with 34 additions and 11 deletions

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:3c98d5589d1f4c8c069065de79a1badf360027c6a9da97d43872dff88556b723 oid sha256:5b6582f963f23df5c6a7574effb6cd54088f83220aeccfde0e6d98286cecd8de
size 247727 size 252813

View File

@ -1,3 +1,21 @@
-------------------------------------------------------------------
Wed May 25 10:23:35 UTC 2022 - Martin Liška <mliska@suse.cz>
- Use https for variosu links.
-------------------------------------------------------------------
Wed May 25 08:56:09 UTC 2022 - Martin Liška <mliska@suse.cz>
- Update binutils-2.38-branch.diff.gz (to 93054037f1e304e)
in order to include PR29087.
-------------------------------------------------------------------
Mon May 9 10:18:29 UTC 2022 - Andreas Schwab <schwab@suse.de>
- Enable multitarget build on riscv64
- On SLE15 and later, use make -Oline to synchronize configure output by
lines
------------------------------------------------------------------- -------------------------------------------------------------------
Wed May 4 12:08:27 UTC 2022 - Martin Liška <mliska@suse.cz> Wed May 4 12:08:27 UTC 2022 - Martin Liška <mliska@suse.cz>

View File

@ -94,7 +94,7 @@ Release: 0
%define make_check_handling false %define make_check_handling false
%endif %endif
# handle all binary object formats supported by SUSE (and a few more) # handle all binary object formats supported by SUSE (and a few more)
%ifarch %ix86 %arm aarch64 ia64 ppc ppc64 ppc64le s390 s390x x86_64 %ifarch %ix86 %arm aarch64 ia64 ppc ppc64 ppc64le riscv64 s390 s390x x86_64
%define build_multitarget 1 %define build_multitarget 1
%else %else
%define build_multitarget 0 %define build_multitarget 0
@ -103,7 +103,7 @@ Release: 0
# #
# #
# #
URL: http://www.gnu.org/software/binutils/ URL: https://www.gnu.org/software/binutils/
PreReq: %{install_info_prereq} PreReq: %{install_info_prereq}
# bug437293 # bug437293
%ifarch ppc64 %ifarch ppc64
@ -211,6 +211,11 @@ The Compact C Type Format (CTF) is a way of representing information about a bin
%endif %endif
%define DIST %(echo '%distribution' | sed 's/ (.*)//') %define DIST %(echo '%distribution' | sed 's/ (.*)//')
%if 0%{suse_version} >= 1500
# Synchronize output by lines, useful for configure output
%define make_output_sync -Oline
%endif
%prep %prep
echo "make check will return with %{make_check_handling} in case of testsuite failures." echo "make check will return with %{make_check_handling} in case of testsuite failures."
%setup -q -n binutils-%{version} %setup -q -n binutils-%{version}
@ -311,7 +316,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
%define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\ %define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\
--prefix=%{_prefix} --libdir=%{_libdir} \\\ --prefix=%{_prefix} --libdir=%{_libdir} \\\
--infodir=%{_infodir} --mandir=%{_mandir} \\\ --infodir=%{_infodir} --mandir=%{_mandir} \\\
--with-bugurl=http://bugs.opensuse.org/ \\\ --with-bugurl=https://bugs.opensuse.org/ \\\
--with-pkgversion="GNU Binutils; %{DIST}" \\\ --with-pkgversion="GNU Binutils; %{DIST}" \\\
--with-separate-debug-dir=%{_prefix}/lib/debug \\\ --with-separate-debug-dir=%{_prefix}/lib/debug \\\
--with-pic --with-system-zlib --build=%{HOST} --with-pic --with-system-zlib --build=%{HOST}
@ -348,14 +353,14 @@ cd build-dir
# we patch headers (bfd-in.h) that are input to other headers # we patch headers (bfd-in.h) that are input to other headers
# which are generated only with --enable-maintainer-mode (which we # which are generated only with --enable-maintainer-mode (which we
# don't do) or explicitely by make headers, so do this: # don't do) or explicitely by make headers, so do this:
make %{?_smp_mflags} all-bfd TARGET-bfd=headers V=1 make %{?make_output_sync} %{?_smp_mflags} all-bfd TARGET-bfd=headers V=1
# the above interacts with --enable-pgo-build=lto because all-bfd doesn't # the above interacts with --enable-pgo-build=lto because all-bfd doesn't
# have the PGO handling, hence it's config.cache files are wrong # have the PGO handling, hence it's config.cache files are wrong
# remove all of those for reconfigure # remove all of those for reconfigure
rm */config.cache rm */config.cache
# force reconfiguring # force reconfiguring
rm bfd/Makefile rm bfd/Makefile
make %{?_smp_mflags} V=1 make %{?make_output_sync} %{?_smp_mflags} V=1
%else %else
# building cross-TARGET-binutils # building cross-TARGET-binutils
@ -402,7 +407,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
%endif %endif
../configure CFLAGS="${RPM_OPT_FLAGS}" \ ../configure CFLAGS="${RPM_OPT_FLAGS}" \
--prefix=%{_prefix} \ --prefix=%{_prefix} \
--with-bugurl=http://bugs.opensuse.org/ \ --with-bugurl=https://bugs.opensuse.org/ \
--with-pkgversion="GNU Binutils; %{DIST}" \ --with-pkgversion="GNU Binutils; %{DIST}" \
--with-system-zlib \ --with-system-zlib \
--disable-nls \ --disable-nls \
@ -421,17 +426,17 @@ EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
--enable-default-hash-style=both \ --enable-default-hash-style=both \
%endif %endif
${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"} ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
make %{?_smp_mflags} all-bfd TARGET-bfd=headers V=1 make %{?make_output_sync} %{?_smp_mflags} all-bfd TARGET-bfd=headers V=1
rm */config.cache rm */config.cache
# force reconfiguring # force reconfiguring
rm bfd/Makefile rm bfd/Makefile
make %{?_smp_mflags} V=1 make %{?make_output_sync} %{?_smp_mflags} V=1
%if "%{TARGET}" == "avr" %if "%{TARGET}" == "avr"
# build an extra nesC version because nesC requires $'s in identifiers # build an extra nesC version because nesC requires $'s in identifiers
cp -a gas gas-nesc cp -a gas gas-nesc
echo '#include "tc-%{TARGET}-nesc.h"' > gas-nesc/targ-cpu.h echo '#include "tc-%{TARGET}-nesc.h"' > gas-nesc/targ-cpu.h
make -C gas-nesc clean make -C gas-nesc clean
make -C gas-nesc %{?_smp_mflags} make -C gas-nesc %{?make_output_sync} %{?_smp_mflags}
%endif %endif
%endif %endif