From b31ea97a0089d8e6451266f051f196bb92622e5e Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 16 Oct 2024 08:46:13 +0200 Subject: [PATCH] try to remove g++-multilib on s390x --- debian/control | 2 +- debian/rules | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index bee671a3..72a44e18 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, libipt-dev [amd64 i386], lcov, procps, help2man, 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, doxygen, time, ocaml-base [amd64 arm64 ppc64el riscv64 s390x] | ocaml-nox [amd64 arm64 ppc64el riscv64 s390x], diff --git a/debian/rules b/debian/rules index 5e4aba68..d2dd2886 100755 --- a/debian/rules +++ b/debian/rules @@ -111,7 +111,7 @@ DH_VERSION := $(shell dpkg -s debhelper | grep '^Version' | awk '{print $$2}') 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 (,$(filter $(DISTRO), bionic focal jammy noble)) MULTILIB_ARCHS := $(filter-out s390x, $(MULTILIB_ARCHS))