diff --git a/debian/changelog b/debian/changelog index 4fab4b80..2cf6f3fa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ llvm-toolchain-19 (1:19.1.0~++rc3-1~exp2) UNRELEASED; urgency=medium * Don't require g++-multilib on s390x for newer Ubuntu releases. * Factor-out ocaml architectures. * Don't try to install xray and profile headers on armel and armhf. + * Disable ocaml on armhf, requires ocamlopt. -- Matthias Klose Tue, 27 Aug 2024 11:47:25 +0200 diff --git a/debian/control b/debian/control index 45a29154..83eb64b3 100644 --- a/debian/control +++ b/debian/control @@ -19,10 +19,10 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, g++-multilib [amd64 i386 kfreebsd-amd64 mips64 mips64el mipsel powerpc ppc64 s390 s390x sparc sparc64 x32], libjs-mathjax, python3-myst-parser | python3-recommonmark, python3-pexpect, doxygen, python3:any, python3-psutil, python3-matplotlib, - ocaml-base [amd64 arm64 armhf ppc64el riscv64 s390x] | ocaml-nox [amd64 arm64 armhf ppc64el riscv64 s390x], - ocaml-findlib [amd64 arm64 armhf ppc64el riscv64 s390x], - libctypes-ocaml-dev [amd64 arm64 armhf ppc64el riscv64 s390x], - dh-exec, dh-ocaml [amd64 arm64 armhf ppc64el riscv64 s390x], + ocaml-base [amd64 arm64 ppc64el riscv64 s390x] | ocaml-nox [amd64 arm64 ppc64el riscv64 s390x], + 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, # "| hello" is for older buster/bionic distros without spirv support # We need to keep the constraints coherent between the two alternatives, otherwise @@ -458,7 +458,7 @@ Description: Modular compiler and toolchain technologies, tools Package: libllvm-19-ocaml-dev Section: ocaml -Architecture: amd64 arm64 armhf ppc64el riscv64 s390x +Architecture: amd64 arm64 ppc64el riscv64 s390x Suggests: llvm-19-doc Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends}, llvm-19-dev (= ${binary:Version}) Replaces: libllvm-x.y-ocaml-dev diff --git a/debian/rules b/debian/rules index dcbe4728..c8eeda69 100755 --- a/debian/rules +++ b/debian/rules @@ -539,7 +539,7 @@ endif DH_OPTIONS= OCAML_ENABLE= no -OCAML_ARCHS := amd64 arm64 armhf ppc64el riscv64 s390x +OCAML_ARCHS := amd64 arm64 ppc64el riscv64 s390x ifneq (,$(filter $(DEB_HOST_ARCH),$(OCAML_ARCHS))) # Enable OCAML for this arch. OCAML_ENABLE=yes