Drop ocaml on armhf, ocamlopt disappeared making build ftbfs

This commit is contained in:
Gianfranco Costamagna 2024-09-09 08:24:01 +02:00
parent 25275086c2
commit ef7221dbda
3 changed files with 11 additions and 11 deletions

10
debian/control vendored
View File

@ -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], g++-multilib [amd64 i386 kfreebsd-amd64 mips64 mips64el mipsel powerpc ppc64 sparc sparc64 x32],
libjs-mathjax, python3-myst-parser | python3-recommonmark, libjs-mathjax, python3-myst-parser | python3-recommonmark,
doxygen, doxygen,
ocaml-base [amd64 arm64 armhf ppc64el riscv64 s390x] | ocaml-nox [amd64 arm64 armhf ppc64el riscv64 s390x], ocaml-base [amd64 arm64 ppc64el riscv64 s390x] | ocaml-nox [amd64 arm64 ppc64el riscv64 s390x],
ocaml-findlib [amd64 arm64 armhf ppc64el riscv64 s390x], ocaml-findlib [amd64 arm64 ppc64el riscv64 s390x],
libctypes-ocaml-dev [amd64 arm64 armhf ppc64el riscv64 s390x], libctypes-ocaml-dev [amd64 arm64 ppc64el riscv64 s390x],
dh-exec, dh-ocaml [amd64 arm64 armhf 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,
# "| hello" is for older buster/bionic distros without spirv support # "| hello" is for older buster/bionic distros without spirv support
# We need to keep the constraints coherent between the two alternatives, otherwise # 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 Package: libllvm-18-ocaml-dev
Section: ocaml Section: ocaml
Architecture: amd64 arm64 armhf ppc64el s390x riscv64 Architecture: amd64 arm64 ppc64el s390x riscv64
Suggests: llvm-18-doc Suggests: llvm-18-doc
Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends}, llvm-18-dev (= ${binary:Version}) Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends}, llvm-18-dev (= ${binary:Version})
Replaces: libllvm-x.y-ocaml-dev Replaces: libllvm-x.y-ocaml-dev

10
debian/control.in vendored
View File

@ -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], g++-multilib [amd64 i386 kfreebsd-amd64 mips64 mips64el mipsel powerpc ppc64 sparc sparc64 x32],
libjs-mathjax, python3-myst-parser | python3-recommonmark, libjs-mathjax, python3-myst-parser | python3-recommonmark,
doxygen, doxygen,
ocaml-base [amd64 arm64 armhf ppc64el riscv64 s390x] | ocaml-nox [amd64 arm64 armhf ppc64el riscv64 s390x], ocaml-base [amd64 arm64 ppc64el riscv64 s390x] | ocaml-nox [amd64 arm64 ppc64el riscv64 s390x],
ocaml-findlib [amd64 arm64 armhf ppc64el riscv64 s390x], ocaml-findlib [amd64 arm64 ppc64el riscv64 s390x],
libctypes-ocaml-dev [amd64 arm64 armhf ppc64el riscv64 s390x], libctypes-ocaml-dev [amd64 arm64 ppc64el riscv64 s390x],
dh-exec, dh-ocaml [amd64 arm64 armhf 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,
# "| hello" is for older buster/bionic distros without spirv support # "| hello" is for older buster/bionic distros without spirv support
# We need to keep the constraints coherent between the two alternatives, otherwise # 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 Package: libllvm-@LLVM_VERSION@-ocaml-dev
Section: ocaml Section: ocaml
Architecture: amd64 arm64 armhf ppc64el s390x riscv64 Architecture: amd64 arm64 ppc64el s390x riscv64
Suggests: llvm-@LLVM_VERSION@-doc Suggests: llvm-@LLVM_VERSION@-doc
Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends}, llvm-@LLVM_VERSION@-dev (= ${binary:Version}) Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends}, llvm-@LLVM_VERSION@-dev (= ${binary:Version})
Replaces: libllvm-x.y-ocaml-dev Replaces: libllvm-x.y-ocaml-dev

2
debian/rules vendored
View File

@ -530,7 +530,7 @@ endif
DH_OPTIONS= DH_OPTIONS=
OCAML_ENABLE= no 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))) ifneq (,$(filter $(DEB_HOST_ARCH),$(OCAML_ARCHS)))
# Enable OCAML for this arch. # Enable OCAML for this arch.
OCAML_ENABLE=yes OCAML_ENABLE=yes