From 040529cc720ebacf76b6cee0cffa7c4aeda8901b Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Sat, 31 Aug 2024 22:17:11 +0200 Subject: [PATCH] * Build without z3 on sh4 (ftbfs). --- debian/changelog | 1 + debian/control | 2 +- debian/control.in | 2 +- debian/rules | 7 +++---- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index fd729277..0a5526b6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ llvm-toolchain-19 (1:19.1.0~++rc3-3) UNRELEASED; urgency=medium * Also explicitly link with -latomic on mips64el. * Disable openmp on loong64 (ld: cannot find -lomptarget.rtl.host). + * Build without z3 on sh4 (ftbfs). -- Matthias Klose Sat, 31 Aug 2024 20:22:25 +0200 diff --git a/debian/control b/debian/control index 1cf35f16..4328d1e2 100644 --- a/debian/control +++ b/debian/control @@ -23,7 +23,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, ocaml-findlib [amd64 arm64 ppc64el riscv64 s390x], libctypes-ocaml-dev [amd64 arm64 ppc64el riscv64 s390x], dh-exec, dh-ocaml [amd64 arm64 ppc64el riscv64 s390x], - libpfm4-dev [linux-any], python3-setuptools, libz3-dev, + libpfm4-dev [linux-any], python3-setuptools, libz3-dev [!sh4], # "| hello" is for older buster/bionic distros without spirv support # We need to keep the constraints coherent between the two alternatives, otherwise # hello would get installed unexpectedly and prevent e.g. wasi-libc from getting pulled diff --git a/debian/control.in b/debian/control.in index a78e1ba8..4ac8fb6c 100644 --- a/debian/control.in +++ b/debian/control.in @@ -23,7 +23,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, ocaml-findlib [@OCAML_ARCHS@], libctypes-ocaml-dev [@OCAML_ARCHS@], dh-exec, dh-ocaml [@OCAML_ARCHS@], - libpfm4-dev [linux-any], python3-setuptools, libz3-dev, + libpfm4-dev [linux-any], python3-setuptools, libz3-dev [!sh4], # "| hello" is for older buster/bionic distros without spirv support # We need to keep the constraints coherent between the two alternatives, otherwise # hello would get installed unexpectedly and prevent e.g. wasi-libc from getting pulled diff --git a/debian/rules b/debian/rules index dcb36c83..13d6b351 100755 --- a/debian/rules +++ b/debian/rules @@ -191,10 +191,9 @@ endif Z3_FLAG = -DLLVM_ENABLE_Z3_SOLVER=OFF ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' libz3-dev) gt 4.7.0; echo $$?),0) -# no ocaml support in main for Ubuntu -ifeq ($(DERIVATIVE),Debian) - Z3_FLAG = -DLLVM_ENABLE_Z3_SOLVER=ON -endif + ifeq (,$(filter $(DEB_HOST_ARCH),sh4)) + Z3_FLAG = -DLLVM_ENABLE_Z3_SOLVER=ON + endif endif STAGE_2_CMAKE_EXTRA += $(Z3_FLAG)