try to remove g++-multilib on s390x

This commit is contained in:
Sylvestre Ledru 2024-10-16 08:46:13 +02:00
parent 320f4d9769
commit b31ea97a00
2 changed files with 2 additions and 2 deletions

2
debian/control vendored
View File

@ -16,7 +16,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build,
libipt-dev [amd64 i386], libipt-dev [amd64 i386],
lcov, procps, help2man, lcov, procps, help2man,
zlib1g-dev, libzstd-dev, zlib1g-dev, libzstd-dev,
g++-multilib [amd64 i386 mips64 mips64el mipsel powerpc ppc64 s390x sparc sparc64 x32], g++-multilib [amd64 i386 mips64 mips64el mipsel powerpc ppc64 sparc sparc64 x32],
libjs-mathjax, python3-myst-parser | python3-recommonmark, python3-pexpect, libjs-mathjax, python3-myst-parser | python3-recommonmark, python3-pexpect,
doxygen, time, doxygen, time,
ocaml-base [amd64 arm64 ppc64el riscv64 s390x] | ocaml-nox [amd64 arm64 ppc64el riscv64 s390x], ocaml-base [amd64 arm64 ppc64el riscv64 s390x] | ocaml-nox [amd64 arm64 ppc64el riscv64 s390x],

2
debian/rules vendored
View File

@ -111,7 +111,7 @@ DH_VERSION := $(shell dpkg -s debhelper | grep '^Version' | awk '{print $$2}')
include /usr/share/dpkg/architecture.mk include /usr/share/dpkg/architecture.mk
MULTILIB_ARCHS := amd64 i386 mips64 mips64el mipsel powerpc ppc64 s390x sparc sparc64 x32 MULTILIB_ARCHS := amd64 i386 mips64 mips64el mipsel powerpc ppc64 sparc sparc64 x32
ifeq ($(DERIVATIVE),Ubuntu) ifeq ($(DERIVATIVE),Ubuntu)
ifeq (,$(filter $(DISTRO), bionic focal jammy noble)) ifeq (,$(filter $(DISTRO), bionic focal jammy noble))
MULTILIB_ARCHS := $(filter-out s390x, $(MULTILIB_ARCHS)) MULTILIB_ARCHS := $(filter-out s390x, $(MULTILIB_ARCHS))