* libllvm19: No symlinks in the llvm-19 subdir. Closes: #1081192, #1082495.

This commit is contained in:
Matthias Klose 2024-09-21 10:40:34 +02:00
parent d4cc10bc94
commit d5fd645d36
5 changed files with 11 additions and 8 deletions

1
debian/changelog vendored
View File

@ -10,6 +10,7 @@ llvm-toolchain-19 (1:19.1.0-4) UNRELEASED; urgency=medium
[ Matthias Klose ]
* Don't relax versioned shlibs dependencies for snapshot builds and
release versions.
* libllvm19: No symlinks in the llvm-19 subdir. Closes: #1081192, #1082495.
-- Matthias Klose <doko@debian.org> Wed, 18 Sep 2024 17:26:29 +0200

8
debian/control vendored
View File

@ -23,7 +23,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build,
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,
libpfm4-dev [linux-any], python3-setuptools, libz3-dev [!sh4],
# "| hello" is for older buster/bionic distros without spirv support
# We need to keep the constraints coherent between the two alternatives, otherwise
# hello would get installed unexpectedly and prevent e.g. wasi-libc from getting pulled
@ -421,9 +421,9 @@ Architecture: any
Depends: ${shlibs:Depends}, libffi-dev, ${misc:Depends},
llvm-19 (= ${binary:Version}), libllvm19 (= ${binary:Version}), libncurses-dev,
llvm-19-tools (= ${binary:Version}), libclang-cpp19 (= ${binary:Version}),
libxml2-dev,
Breaks: libllvm19 (<< 1:19.1.0~++rc4-5)
Replaces: libllvm19 (<< 1:19.1.0~++rc4-5)
libxml2-dev, libz3-dev [!sh4],
Breaks: libllvm19 (<< 1:19.1.0-4)
Replaces: libllvm19 (<< 1:19.1.0-4)
Description: Modular compiler and toolchain technologies, libraries and headers
LLVM is a collection of libraries and tools that make it easy to build
compilers, optimizers, just-in-time code generators, and many other

4
debian/control.in vendored
View File

@ -422,8 +422,8 @@ Depends: ${shlibs:Depends}, libffi-dev, ${misc:Depends},
llvm-@LLVM_VERSION@ (= ${binary:Version}), libllvm@LLVM_VERSION@ (= ${binary:Version}), libncurses-dev,
llvm-@LLVM_VERSION@-tools (= ${binary:Version}), libclang-cpp@LLVM_VERSION@ (= ${binary:Version}),
libxml2-dev, @Z3_DEV_DEP@
Breaks: libllvm@LLVM_VERSION@ (<< 1:19.1.0~++rc4-5)
Replaces: libllvm@LLVM_VERSION@ (<< 1:19.1.0~++rc4-5)
Breaks: libllvm@LLVM_VERSION@ (<< 1:19.1.0-4)
Replaces: libllvm@LLVM_VERSION@ (<< 1:19.1.0-4)
Description: Modular compiler and toolchain technologies, libraries and headers
LLVM is a collection of libraries and tools that make it easy to build
compilers, optimizers, just-in-time code generators, and many other

View File

@ -1,4 +1,3 @@
# provide symlinks in the LLVM subdir
# symlink to the soname in the llvm libdir
usr/lib/@DEB_HOST_MULTIARCH@/libLLVM.so.@LLVM_VERSION@.@LLVM_VERSION_MINOR@ usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so.@LLVM_VERSION@.@LLVM_VERSION_MINOR@
# no symlinks in the LLVM subdir, the package is M-A: same

View File

@ -21,3 +21,6 @@ usr/lib/llvm-@LLVM_VERSION@/lib/cmake/llvm usr/lib/llvm-@LLVM_VERSION@/share/llv
#
# but this file does not exist.
usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so.@LLVM_VERSION@.@LLVM_VERSION_MINOR@ usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so.1
# symlink to the soname in the llvm libdir
usr/lib/@DEB_HOST_MULTIARCH@/libLLVM.so.@LLVM_VERSION@.@LLVM_VERSION_MINOR@ usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so.@LLVM_VERSION@.@LLVM_VERSION_MINOR@