* Factor-out ocaml architectures.

This commit is contained in:
Matthias Klose 2024-08-27 12:20:00 +02:00
parent 1fc85c3142
commit df85a63901
4 changed files with 8 additions and 6 deletions

1
debian/changelog vendored
View File

@ -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 a .gitignore file with all toplevel upstream files and directories.
* Add some memory tracking, getting some information on memory hogs. * Add some memory tracking, getting some information on memory hogs.
* Don't require g++-multilib on s390x for newer Ubuntu releases. * Don't require g++-multilib on s390x for newer Ubuntu releases.
* Factor-out ocaml architectures.
-- Matthias Klose <doko@ubuntu.com> Tue, 27 Aug 2024 11:47:25 +0200 -- Matthias Klose <doko@ubuntu.com> Tue, 27 Aug 2024 11:47:25 +0200

2
debian/control vendored
View File

@ -458,7 +458,7 @@ Description: Modular compiler and toolchain technologies, tools
Package: libllvm-19-ocaml-dev Package: libllvm-19-ocaml-dev
Section: ocaml Section: ocaml
Architecture: amd64 arm64 armhf ppc64el s390x riscv64 Architecture: amd64 arm64 armhf ppc64el riscv64 s390x
Suggests: llvm-19-doc Suggests: llvm-19-doc
Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends}, llvm-19-dev (= ${binary:Version}) Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends}, llvm-19-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 [@MULTILIB_ARCHS@], g++-multilib [@MULTILIB_ARCHS@],
libjs-mathjax, python3-myst-parser | python3-recommonmark, python3-pexpect, libjs-mathjax, python3-myst-parser | python3-recommonmark, python3-pexpect,
doxygen,@USAGE_BUILD_DEP@ doxygen,@USAGE_BUILD_DEP@
ocaml-base [amd64 arm64 armhf ppc64el riscv64 s390x] | ocaml-nox [amd64 arm64 armhf ppc64el riscv64 s390x], ocaml-base [@OCAML_ARCHS@] | ocaml-nox [@OCAML_ARCHS@],
ocaml-findlib [amd64 arm64 armhf ppc64el riscv64 s390x], ocaml-findlib [@OCAML_ARCHS@],
libctypes-ocaml-dev [amd64 arm64 armhf ppc64el riscv64 s390x], libctypes-ocaml-dev [@OCAML_ARCHS@],
dh-exec, dh-ocaml [amd64 arm64 armhf ppc64el riscv64 s390x], dh-exec, dh-ocaml [@OCAML_ARCHS@],
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
@ -458,7 +458,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: @OCAML_ARCHS@
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

1
debian/rules vendored
View File

@ -664,6 +664,7 @@ stamps/preconfigure:
sed -e 's|@DEB_HOST_MULTIARCH@|$(DEB_HOST_MULTIARCH)|g' \ sed -e 's|@DEB_HOST_MULTIARCH@|$(DEB_HOST_MULTIARCH)|g' \
-e "s|@USAGE_BUILD_DEP@|$(USAGE_BUILD_DEP)|g" \ -e "s|@USAGE_BUILD_DEP@|$(USAGE_BUILD_DEP)|g" \
-e "s|@MULTILIB_ARCHS@|$(MULTILIB_ARCHS)|g" \ -e "s|@MULTILIB_ARCHS@|$(MULTILIB_ARCHS)|g" \
-e "s|@OCAML_ARCHS@|$(OCAML_ARCHS)|g" \
-e "s|@BRANCH_NAME@|$(BRANCH_NAME)|g" \ -e "s|@BRANCH_NAME@|$(BRANCH_NAME)|g" \
-e "s|@OCAML_STDLIB_DIR@|$(OCAML_STDLIB_DIR)|g" \ -e "s|@OCAML_STDLIB_DIR@|$(OCAML_STDLIB_DIR)|g" \
-e "s|@LLVM_EPOCH@|$(LLVM_EPOCH)|g" \ -e "s|@LLVM_EPOCH@|$(LLVM_EPOCH)|g" \