Bug#1063642: gcc-13: Fix disabling go and m2 according to OS
Package: gcc-13
Version: 13.2.0-13
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
Versions of packages gcc-13 depends on:
ii binutils 2.42-2
ii gcc-13-base 13.2.0-13
ii gcc-13-x86-64-linux-gnu 13.2.0-13
Versions of packages gcc-13 recommends:
ii libc6-dev 2.37-15~deb13u1
Versions of packages gcc-13 suggests:
ii gcc-13-doc 13.2.0-1
pn gcc-13-locales <none>
ii gcc-13-multilib 13.2.0-13
-- no debconf information
--
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 8638be92..4fa62c62 100644
--- a/debian/rules.defs
+++ b/debian/rules.defs
@@ -1019,41 +1019,41 @@ endif
go_no_cpus := arc avr hppa loong64
go_no_cpus += m68k # See PR 79281 / PR 83314
go_no_systems := kfreebsd-gnu
ifneq (,$(filter $(distrelease),precise))
go_no_cpus = armhf
go_no_archs = armhf
endif
# Debian #969221
go_no_cpus += sh4
go_no_archs += sh4
ifneq ($(with_base_only),yes)
ifneq ($(separate_lang),yes)
with_go := yes
endif
endif
ifneq (,$(filter $(DEB_TARGET_ARCH_CPU),$(go_no_cpus)))
with_go := disabled for cpu $(DEB_TARGET_ARCH_CPU)
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
ifneq (,$(filter $(DEB_TARGET_ARCH),$(go_no_archs)))
with_go := disabled for architecture $(DEB_TARGET_ARCH)
endif
ifeq ($(go_no_cross)-$(DEB_CROSS),yes-yes)
with_go := disabled for cross compiler package
endif
ifeq ($(DEB_STAGE)-$(filter libgo, $(with_rtlibs)),rtlibs-)
with_go := disabled for rtlibs stage
endif
with_go := $(call envfilt, go, , , $(with_go))
# Build all packages needed for Go development
ifneq (,$(findstring gcc, $(PKGSOURCE)))
ifeq ($(with_go),yes)
ifeq ($(with_dev),yes)
with_godev := yes
endif
with_libgo := yes
@@ -1262,41 +1262,41 @@ endif
with_objcxx := $(call envfilt, obj-c++, , c++ objc, $(with_objcxx))
ifeq ($(with_objcxx),yes)
enabled_languages += obj-c++
endif
# Modula-2 -------------------
m2_no_cross := yes
m2_no_cross := no
ifneq ($(with_base_only),yes)
ifneq ($(separate_lang),yes)
with_m2 := yes
endif
endif
m2_no_cpus = loong64 powerpc ppc64 sh4
m2_no_systems = gnu kfreebsd-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)
with_m2 := disabled for cross compiler package
endif
ifeq ($(DEB_STAGE)-$(filter libgm2, $(with_rtlibs)),rtlibs-)
with_m2 := disabled for rtlibs stage
endif
ifneq (,$(filter $(distrelease),precise))
with_m2 := disabled for $(distrelease) backport
endif
#with_m2 := disabled for GCC 13
with_m2 := $(call envfilt, m2, , , $(with_m2))
# Build all packages needed for Modula-2 development
ifeq ($(with_m2),yes)
ifeq ($(with_dev),yes)
with_m2dev := yes
endif
Reply to: