Bug#1056765: gcc-9: Remove references to obsolete dpkg m32r and tilegx arches
Source: gcc-9
Source-Version: 9.5.0-4
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 4374a74a6f4f48d2bdf59561a8dfbf751bc0d629 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sat, 25 Nov 2023 23:44:48 +0100
Subject: [PATCH] Remove references to obsolete m32r and tilegx arches
Support for these arches got removed from 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 ef2254d..12dec06 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], nvptx-tools [amd64 ppc64el],
texinfo (>= 4.3), locales-all, sharutils,
- procps, gnat-9:native [!m32r !sh3 !sh3eb !sh4eb !m68k], g++-9:native, netbase, libpth-dev, python3:any,
+ procps, gnat-9:native [!sh3 !sh3eb !sh4eb !m68k], g++-9:native, netbase, libpth-dev, 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],
dejagnu [!m68k] <!nocheck>, coreutils (>= 2.26) | realpath (>= 1.9.12), chrpath, lsb-release, quilt,
pkg-config, libgc-dev,
diff --git a/debian/rules.defs b/debian/rules.defs
index c9689c4..2041d75 100644
--- a/debian/rules.defs
+++ b/debian/rules.defs
@@ -809,7 +809,7 @@ endif
ifeq (,$(filter $(DEB_STAGE),stage1 stage2))
# Ada --------------------
-ada_no_cpus := m32r sh3 sh3eb sh4eb
+ada_no_cpus := sh3 sh3eb sh4eb
# no Debian builds ... some of these should exist
# ... cross-build-native cross-builds a non-working compiler ...
ifneq (,$(filter $(build_type), build-native))
diff --git a/debian/rules2 b/debian/rules2
index 41b65ac..1389cc3 100644
--- a/debian/rules2
+++ b/debian/rules2
@@ -533,10 +533,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=rv64imafdc --with-abi=lp64d
--
2.42.0
Reply to: