Hello,
John Paul Adrian Glaubitz, le mer. 19 juin 2024 13:22:52 +0200, a ecrit:
> gcc-14 needs to build-depend on cargo on hurd-i386 to be able to build gccrs
> [1]:
>
>configure: error: cargo is required to build rust
More precisely, rs_no_systems was not actually working. And conversely,
rust was actually ported to hurd, so we can enable rs on it.
The attached patch achieves both.
Samuel
diff --git a/debian/control b/debian/control
index 3ae16fd6..a7e40296 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends: debhelper (>= 11), dpkg-dev (>= 1.17.14),
g++-multilib [amd64 i38
gperf, bison, flex,
gettext, nvptx-tools [amd64 arm64 ppc64el], amdgcn-tools-18 [amd64],
texinfo, locales-all, sharutils,
- procps, gnat-13:native [!sparc !loong64], g++-13:native [!loong64],
gnat-13:native [loong64], g++-14:native [loong64], netbase, gdc-13:native [!arc
!ia64 !m68k !sh4 !s390 !sparc64 !alpha !hurd-alpha !hurd-amd64 !hurd-i386],
python3:any, cargo [!hppa !ia64 !m68k !sh4 !alpha !hurd-alpha !hurd-amd64
!hurd-i386],
+ procps, gnat-13:native [!sparc !loong64], g++-13:native [!loong64],
gnat-13:native [loong64], g++-14:native [loong64], netbase, gdc-13:native [!arc
!ia64 !m68k !sh4 !s390 !sparc64 !alpha !hurd-alpha !hurd-amd64 !hurd-i386],
python3:any, cargo [!hppa !ia64 !m68k !sh4 !alpha !hurd-alpha],
libisl-dev (>= 0.20), libmpc-dev (>= 1.0), libmpfr-dev (>= 3.0.0-9~),
libgmp-dev (>= 2:5.0.1~), lib32z1-dev [amd64], lib64z1-dev [i386], unzip
,
dejagnu , coreutils, chrpath, lsb-release, quilt, time,
pkg-config, libgc-dev,
diff --git a/debian/rules.defs b/debian/rules.defs
index 57a4b8ec..dbaf7f0f 100644
--- a/debian/rules.defs
+++ b/debian/rules.defs
@@ -1235,7 +1235,7 @@ endif
rs_no_cross := yes
rs_no_cpus = alpha hppa ia64 m68k sh4
-rs_no_systems := gnu
+rs_no_systems :=
ifneq ($(with_base_only),yes)
ifneq ($(separate_lang),yes)
@@ -1245,6 +1245,9 @@ endif
ifneq (,$(filter $(DEB_TARGET_ARCH_CPU),$(rs_no_cpus)))
with_rs := disabled for arch $(DEB_TARGET_ARCH_CPU)
endif
+ifneq (,$(findstring $(DEB_TARGET_GNU_SYSTEM),$(rs_no_systems)))
+ with_rs := disabled for system $(DEB_TARGET_GNU_SYSTEM)
+endif
ifeq ($(rs_no_cross)-$(DEB_CROSS),yes-yes)
with_rs := disabled for cross compiler package
endif
