From df85a63901037b237e273c03920b62b0ead01f66 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Tue, 27 Aug 2024 12:20:00 +0200 Subject: [PATCH] * Factor-out ocaml architectures. --- debian/changelog | 1 + debian/control | 2 +- debian/control.in | 10 +++++----- debian/rules | 1 + 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 472caae3..cc020d44 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ llvm-toolchain-19 (1:19.1.0~++rc3-1~exp2) UNRELEASED; urgency=medium * Add a .gitignore file with all toplevel upstream files and directories. * Add some memory tracking, getting some information on memory hogs. * Don't require g++-multilib on s390x for newer Ubuntu releases. + * Factor-out ocaml architectures. -- Matthias Klose Tue, 27 Aug 2024 11:47:25 +0200 diff --git a/debian/control b/debian/control index 046d46a3..45a29154 100644 --- a/debian/control +++ b/debian/control @@ -458,7 +458,7 @@ Description: Modular compiler and toolchain technologies, tools Package: libllvm-19-ocaml-dev Section: ocaml -Architecture: amd64 arm64 armhf ppc64el s390x riscv64 +Architecture: amd64 arm64 armhf 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/control.in b/debian/control.in index 8b7ecf75..bb21dcb8 100644 --- a/debian/control.in +++ b/debian/control.in @@ -19,10 +19,10 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, g++-multilib [@MULTILIB_ARCHS@], libjs-mathjax, python3-myst-parser | python3-recommonmark, python3-pexpect, doxygen,@USAGE_BUILD_DEP@ - 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 [@OCAML_ARCHS@] | ocaml-nox [@OCAML_ARCHS@], + ocaml-findlib [@OCAML_ARCHS@], + libctypes-ocaml-dev [@OCAML_ARCHS@], + dh-exec, dh-ocaml [@OCAML_ARCHS@], 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-@LLVM_VERSION@-ocaml-dev Section: ocaml -Architecture: amd64 arm64 armhf ppc64el s390x riscv64 +Architecture: @OCAML_ARCHS@ 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 429204ff..a169fa69 100755 --- a/debian/rules +++ b/debian/rules @@ -664,6 +664,7 @@ stamps/preconfigure: sed -e 's|@DEB_HOST_MULTIARCH@|$(DEB_HOST_MULTIARCH)|g' \ -e "s|@USAGE_BUILD_DEP@|$(USAGE_BUILD_DEP)|g" \ -e "s|@MULTILIB_ARCHS@|$(MULTILIB_ARCHS)|g" \ + -e "s|@OCAML_ARCHS@|$(OCAML_ARCHS)|g" \ -e "s|@BRANCH_NAME@|$(BRANCH_NAME)|g" \ -e "s|@OCAML_STDLIB_DIR@|$(OCAML_STDLIB_DIR)|g" \ -e "s|@LLVM_EPOCH@|$(LLVM_EPOCH)|g" \