Bug#1063643: gcc-14: Fix disabling go and m2 according to OS

[Samuel Thibault <sthibault@debian.org>]

Samuel Thibault, le sam. 10 févr. 2024 13:07:44 +0100, a ecrit:
> 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.

Actually in the gcc-14 case there was another typo, updated patch
attached.

Samuel

diff --git a/debian/rules.defs b/debian/rules.defs
index 2810b233..6ef02c98 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)
@@ -1185,11 +1185,11 @@ ifneq ($(with_base_only),yes)
   endif
 endif
 m2_no_cpus = loong64 powerpc ppc64 sh4
-n2_no_systems = gnu
+m2_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)