From ef7221dbda7ad814dcb19b210cfa9eb425deb9a3 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Mon, 9 Sep 2024 08:24:01 +0200 Subject: [PATCH] Drop ocaml on armhf, ocamlopt disappeared making build ftbfs --- debian/control | 10 +++++----- debian/control.in | 10 +++++----- debian/rules | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/debian/control b/debian/control index 4d48a096..5aa53557 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 sparc sparc64 x32], libjs-mathjax, python3-myst-parser | python3-recommonmark, doxygen, - 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 @@ -462,7 +462,7 @@ Description: Modular compiler and toolchain technologies, tools Package: libllvm-18-ocaml-dev Section: ocaml -Architecture: amd64 arm64 armhf ppc64el s390x riscv64 +Architecture: amd64 arm64 ppc64el s390x riscv64 Suggests: llvm-18-doc Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends}, llvm-18-dev (= ${binary:Version}) Replaces: libllvm-x.y-ocaml-dev diff --git a/debian/control.in b/debian/control.in index cc556cde..d157100e 100644 --- a/debian/control.in +++ b/debian/control.in @@ -19,10 +19,10 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, g++-multilib [amd64 i386 kfreebsd-amd64 mips64 mips64el mipsel powerpc ppc64 sparc sparc64 x32], libjs-mathjax, python3-myst-parser | python3-recommonmark, doxygen, - 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 @@ -462,7 +462,7 @@ Description: Modular compiler and toolchain technologies, tools Package: libllvm-@LLVM_VERSION@-ocaml-dev Section: ocaml -Architecture: amd64 arm64 armhf ppc64el s390x riscv64 +Architecture: amd64 arm64 ppc64el s390x riscv64 Suggests: llvm-@LLVM_VERSION@-doc Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends}, llvm-@LLVM_VERSION@-dev (= ${binary:Version}) Replaces: libllvm-x.y-ocaml-dev diff --git a/debian/rules b/debian/rules index e112d4ad..0c13266e 100755 --- a/debian/rules +++ b/debian/rules @@ -530,7 +530,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