Bug#1056767: gcc-11: Remove references to obsolete dpkg m32r and tilegx arches
Source: gcc-11
Source-Version: 11.4.0-5
Severity: important
Tags: patch
Hi!
Support for these arches got removed in dpkg 1.22.0, which means that
once the host running dak gets its dpkg upgraded to that version it
might start being unhappy about the unknown architectures.
Attached an untested patch that removes references to these obsolete
arches.
Thanks,
Guillem
From 774a10b382999154a50710417e1721805fea0fd0 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sun, 26 Nov 2023 00:16:51 +0100
Subject: [PATCH] Remove references to obsolete m32r and tilegx arches
Support for these arches got removed in dpkg 1.22.0, which means
that once the host running dak gets its dpkg upgraded to that version
it might start being unhappy about the unknown architectures.
---
debian/control | 2 +-
debian/rules.defs | 2 +-
debian/rules2 | 4 ----
3 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/debian/control b/debian/control
index cc329cd..d751261 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends: debhelper (>= 9.20141010), dpkg-dev (>= 1.17.14), g++-multilib [a
gperf (>= 3.0.1), bison (>= 1:2.3), flex, gettext,
gdb:native [!riscv64 !mipsel !mips64el], nvptx-tools [amd64 ppc64el], amdgcn-tools [amd64],
texinfo (>= 4.3), locales-all, sharutils,
- procps, gnat-11:native [!arc !ia64 !loong64 !m32r !sh3 !sh3eb !sh4eb !m68k], g++-11:native, netbase, python3:any,
+ procps, gnat-11:native [!arc !ia64 !loong64 !sh3 !sh3eb !sh4eb !m68k], g++-11:native, netbase, python3:any,
libisl-dev (>= 0.20), libmpc-dev (>= 1.0), libmpfr-dev (>= 3.0.0-9~), libgmp-dev (>= 2:5.0.1~), lib32z1-dev [amd64 kfreebsd-amd64], lib64z1-dev [i386], unzip <!nocheck>,
dejagnu [!alpha !hurd-alpha] <!nocheck>, coreutils (>= 2.26) | realpath (>= 1.9.12), chrpath, lsb-release, quilt, time,
pkg-config, libgc-dev,
diff --git a/debian/rules.defs b/debian/rules.defs
index 494cfd1..4291a83 100644
--- a/debian/rules.defs
+++ b/debian/rules.defs
@@ -845,7 +845,7 @@ endif
ifeq (,$(filter $(DEB_STAGE),stage1 stage2))
# Ada --------------------
-ada_no_cpus := arc ia64 loong64 m32r sh3 sh3eb sh4eb
+ada_no_cpus := arc ia64 loong64 sh3 sh3eb sh4eb
ada_no_cpus += m68k # https://gcc.gnu.org/PR98341
ada_no_systems :=
ada_no_cross := no
diff --git a/debian/rules2 b/debian/rules2
index 1a151c1..6b5f77a 100644
--- a/debian/rules2
+++ b/debian/rules2
@@ -545,10 +545,6 @@ ifneq (,$(findstring m68k-linux,$(DEB_TARGET_GNU_TYPE)))
CONFARGS += --disable-multilib
endif
-ifneq (,$(filter tilegx,$(DEB_TARGET_GNU_CPU)))
- CONFARGS += --disable-multilib
-endif
-
ifneq (,$(findstring riscv64-linux,$(DEB_TARGET_GNU_TYPE)))
CONFARGS += --disable-multilib
CONFARGS += --with-arch=rv64gc --with-abi=lp64d
--
2.42.0
Reply to: