From: Peter Michael Green Date: Thu, 18 Nov 2021 22:06:03 +0000 (+0000) Subject: Manual merge of version 2.37-5+rpi1 and 2.37-7 to produce 2.37-7+rpi1 X-Git-Tag: raspbian/2.37-7+rpi1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4463ea9e784697fff0cb6fdd793143e3c6e55604;p=binutils.git Manual merge of version 2.37-5+rpi1 and 2.37-7 to produce 2.37-7+rpi1 --- 162d6a3114a8b8aa18ea56dd5bed3950947558e6 diff --cc debian/changelog index 5d1a2ec34,125f0da87..dca328011 --- a/debian/changelog +++ b/debian/changelog @@@ -1,31 -1,15 +1,44 @@@ - binutils (2.37-5+rpi1) bookworm-staging; urgency=medium ++binutils (2.37-7+rpi1) bookworm-staging; urgency=medium + + [changes brought forward from 2.29-4+rpi1 by Peter Michael Green at Thu, 17 Aug 2017 15:41:49 +0000] + * Disable testsuite, it fails on our lxc based autobuilders. + + [changes brought forward from 2.31.1-16+rpi2 by Peter Michael Green at Thu, 06 Feb 2020 17:10:11 +0000] + * Allow dependency of binutils on binutils-triplet to be satisfied by + foreign architectures, to facilitate setting up environments where the + linker is 64-bit while everything else is 32-bit. + + [changes brought forward from 2.35-3+rpi2 by Peter Michael Green at Tue, 22 Sep 2020 18:10:17 +0000] + * Build sufficient cross binutils to support u-boot build. + + [changes brought forward from 2.35.1-3+rpi2 by Peter Michael Green at Tue, 01 Dec 2020 21:55:01 +0000] + * Build the same set of cross-binutils on arm64 as on armhf. + (avoids issues when control is generated on armhf and then package is + built on arm64) + * Remove build-depends as testsuite is disabled. + + [changes introduced in 2.35.1-5+rpi1 by Peter Michael Green] + * Touch gold/yyscript.h and gold/yyscript.c in clean target to ensure they are + newer than yyscript.y and hence stop the upstream build system trying to + regenerate them when building from a git checkout. + + [changes brought forward from 2.37-4+rpi2 by Peter Michael Green at Wed, 01 Sep 2021 12:43:37 +0000] + * Fix merge screwup that left us with no arm64 cross binutils. + - -- Raspbian forward porter Thu, 02 Sep 2021 14:37:32 +0000 ++ -- Raspbian forward porter Sun, 26 Sep 2021 01:45:11 +0000 ++ + binutils (2.37-7) unstable; urgency=medium + + * Fix PR ld/28348, taken from the trunk. Closes: #994530. + * Revert the arc build, needs dpkg supporting this architecture. + + -- Matthias Klose Sun, 19 Sep 2021 17:23:57 +0200 + + binutils (2.37-6) unstable; urgency=medium + + * Add support to build for arc-linux-gnu. Closes: #994190. + + -- Matthias Klose Tue, 14 Sep 2021 08:41:56 +0200 binutils (2.37-5) unstable; urgency=medium diff --cc debian/rules index a7d02fe50,86e560749..756fb38c4 --- a/debian/rules +++ b/debian/rules @@@ -536,7 -534,9 +536,9 @@@ CONFARGS_TARGET_mips64r6el = --enable-t CONFARGS_TARGET_aarch64 = --enable-targets=aarch64_be-linux-gnu + CONFARGS_TARGET_arc = --with-cpu=hs38_linux + -with_check := yes +with_check := disabled by plugwash ifneq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) # override buildd admins to run the testsuite anyway ... ifeq (,$(filter $(DEB_HOST_ARCH), m68k powerpc sh4 sparc64))