Bug#1063643: gcc-14: Fix disabling go and m2 according to OS
Source: gcc-14
Version: 14-20240201-3
Severity: important
Tags: patch
User: debian-hurd@lists.debian.org
Usertags: hurd
Hello,
There was a typo in rules.defs concerning go_no_systems and
m2_no_systems: they are still compared against DEB_TARGET_ARCH_OS,
while their content is gnu-system-like (kfreebsd-gnu, gnu), and
indeed all other foo_no_systems variables are compared against
DEB_TARGET_GNU_SYSTEM.
This was making the hurd-i386 build get stuck while building m2, the
attached patch fixes it.
Samuel
-- System Information:
Debian Release: trixie/sid
APT prefers testing
APT policy: (990, 'testing'), (500, 'unstable-debug'), (500, 'unreleased'), (500, 'testing-debug'), (500, 'stable-security'), (500, 'stable-debug'), (500, 'oldstable-proposed-updates-debug'), (500, 'oldstable-proposed-updates'), (500, 'oldoldstable-proposed-updates'), (500, 'oldoldstable'), (500, 'buildd-unstable'), (500, 'unstable'), (500, 'stable'), (500, 'oldstable'), (1, 'experimental-debug'), (1, 'buildd-experimental'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386, arm64
Kernel: Linux 6.7.0 (SMP w/8 CPU threads; PREEMPT)
Kernel taint flags: TAINT_WARN, TAINT_OOT_MODULE, TAINT_UNSIGNED_MODULE
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
--
Samuel
---
Pour une évaluation indépendante, transparente et rigoureuse !
Je soutiens la Commission d'Évaluation de l'Inria.
diff --git a/debian/rules.defs b/debian/rules.defs
index 2810b233..1bb4b96e 100644
--- a/debian/rules.defs
+++ b/debian/rules.defs
@@ -989,7 +989,7 @@ endif
ifneq (,$(filter $(DEB_TARGET_ARCH),$(go_no_cpus)))
with_go := disabled for arch $(DEB_TARGET_ARCH)
endif
-ifneq (,$(findstring $(DEB_TARGET_ARCH_OS),$(go_no_systems)))
+ifneq (,$(findstring $(DEB_TARGET_GNU_SYSTEM),$(go_no_systems)))
with_go := disabled for system $(DEB_TARGET_GNU_SYSTEM)
endif
ifeq ($(go_no_cross)-$(DEB_CROSS),yes-yes)
@@ -1189,7 +1189,7 @@ n2_no_systems = gnu
ifneq (,$(filter $(DEB_TARGET_ARCH_CPU),$(m2_no_cpus)))
with_m2 := disabled for cpu $(DEB_TARGET_ARCH_CPU)
endif
-ifneq (,$(findstring $(DEB_TARGET_ARCH_OS),$(m2_no_systems)))
+ifneq (,$(findstring $(DEB_TARGET_GNU_SYSTEM),$(m2_no_systems)))
with_m2 := disabled for system $(DEB_TARGET_GNU_SYSTEM)
endif
ifeq ($(m2_no_cross)-$(DEB_CROSS),yes-yes)
Reply to: