Package: src:dpkg Version: 1.18.6 Severity: normal Tags: patch gcc in unstable now generates code for i686, not i586, and cross-build tools are named accordingly. Please update the architecture table in dpkg.
Ben. -- System Information: Debian Release: stretch/sid APT prefers stable-updates APT policy: (500, 'stable-updates'), (500, 'unstable'), (500, 'stable'), (1, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.5.0-2-amd64 (SMP w/4 CPU cores) Locale: LANG=C.UTF-8, LC_CTYPE=C.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system)
>From be324041443b7acbe1970474b37c0072b20458f6 Mon Sep 17 00:00:00 2001 From: Ben Hutchings <b...@decadent.org.uk> Date: Tue, 3 May 2016 00:53:25 +0200 Subject: [PATCH] Bump the i386 architecture GNU triplet to i686-linux-gnu to match the change in gcc --- cputable | 2 +- debian/changelog | 4 ++++ debian/rules | 7 ------- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/cputable b/cputable index 2177200089b3..2088d8eef112 100644 --- a/cputable +++ b/cputable @@ -14,7 +14,7 @@ # Column 5 is the endianness (byte ordering in numbers) # # <Debian name> <GNU name> <config.guess regex> <Bits> <Endianness> -i386 i586 (i[34567]86|pentium) 32 little +i386 i686 (i[34567]86|pentium) 32 little ia64 ia64 ia64 64 little alpha alpha alpha.* 64 little amd64 x86_64 (amd64|x86_64) 64 little diff --git a/debian/changelog b/debian/changelog index 0d3360c3b557..fcc5c71f20f4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,10 @@ dpkg (1.18.7) UNRELEASED; urgency=medium [ Updated manpages translations ] * German (Helge Kreutzmann). + [ Ben Hutchings ] + * Bump the i386 architecture GNU triplet to i686-linux-gnu to match the + change in gcc. + -- Guillem Jover <guil...@debian.org> Tue, 03 May 2016 21:07:19 +0200 dpkg (1.18.6) unstable; urgency=medium diff --git a/debian/rules b/debian/rules index 5d515e8a2e9b..146f3c266407 100755 --- a/debian/rules +++ b/debian/rules @@ -86,13 +86,6 @@ install: check cd build-tree && $(MAKE) DESTDIR=$(D) install -ifeq (yes,$(shell dpkg-vendor --derives-from Ubuntu && echo yes)) - # Ubuntu's «i386» architecture is built for i686 (the Debian default - # is i586). - sed -ri 's/^(i386[[:space:]]+)[^[:space:]]+/\1i686/' \ - $(D)/usr/share/dpkg/cputable -endif - define dpkg-installmanl10n for f in `sed -e 's:\*:*/*:' debian/$(1).manpages`; do \ test -e $$f && \
