From f1ce55f708cb1e8a852f13f57d7cd30b0c9ca3da Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Mon, 9 Sep 2024 10:45:07 +0200 Subject: [PATCH] * Move the libLLVM.so.1 symlink into llvm-19-dev. Closes: #1081192. --- debian/changelog | 6 ++++++ debian/control | 6 ++++-- debian/control.in | 6 ++++-- debian/libllvmX.Y.links.in | 14 -------------- debian/llvm-X.Y-dev.links.in | 10 ++++++++++ 5 files changed, 24 insertions(+), 18 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3c62e1af..9b9572f4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-19 (1:19.1.0~++rc4-5) UNRELEASED; urgency=medium + + * Move the libLLVM.so.1 symlink into llvm-19-dev. Closes: #1081192. + + -- Matthias Klose Mon, 09 Sep 2024 10:37:51 +0200 + llvm-toolchain-19 (1:19.1.0~++rc4-4) unstable; urgency=medium [ Matthias Klose ] diff --git a/debian/control b/debian/control index 31508bd7..2098d294 100644 --- a/debian/control +++ b/debian/control @@ -347,8 +347,8 @@ Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} Pre-Depends: ${misc:Pre-Depends} Multi-Arch: same -Breaks: llvm19-dev (<< 1:19.1.0~++rc3-1~exp2) -Replaces: llvm19-dev (<< 1:19.1.0~++rc3-1~exp2) +Breaks: llvm-19-dev (<< 1:19.1.0~++rc3-1~exp2) +Replaces: llvm-19-dev (<< 1:19.1.0~++rc3-1~exp2) Description: Modular compiler and toolchain technologies, runtime library LLVM is a collection of libraries and tools that make it easy to build compilers, optimizers, just-in-time code generators, and many other @@ -422,6 +422,8 @@ 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, libz3-dev [!sh4], +Breaks: libllvm19 (<< 1:19.1.0~++rc4-5) +Replaces: libllvm19 (<< 1:19.1.0~++rc4-5) 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 diff --git a/debian/control.in b/debian/control.in index ea465098..bf23b86a 100644 --- a/debian/control.in +++ b/debian/control.in @@ -347,8 +347,8 @@ Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} Pre-Depends: ${misc:Pre-Depends} Multi-Arch: same -Breaks: llvm@LLVM_VERSION@-dev (<< 1:19.1.0~++rc3-1~exp2) -Replaces: llvm@LLVM_VERSION@-dev (<< 1:19.1.0~++rc3-1~exp2) +Breaks: llvm-@LLVM_VERSION@-dev (<< 1:19.1.0~++rc3-1~exp2) +Replaces: llvm-@LLVM_VERSION@-dev (<< 1:19.1.0~++rc3-1~exp2) Description: Modular compiler and toolchain technologies, runtime library LLVM is a collection of libraries and tools that make it easy to build compilers, optimizers, just-in-time code generators, and many other @@ -422,6 +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) 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 diff --git a/debian/libllvmX.Y.links.in b/debian/libllvmX.Y.links.in index 8166bf82..7edd6f22 100644 --- a/debian/libllvmX.Y.links.in +++ b/debian/libllvmX.Y.links.in @@ -2,17 +2,3 @@ # 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@ - -# FIXME: CMake requires this file, but for what? Fix LLVMExports.cmake instead? -# -# CMake Error at /usr/lib/llvm-19/lib/cmake/llvm/LLVMExports.cmake:1908 (message): -# The imported target "LLVM" references the file -# -# "/usr/lib/llvm-19/lib/libLLVM.so.1" -# -# 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 - -# FIXME: why is this one needed? This already is in the llvm-dev package in the llvm libdir -# create symlink to the symlink installed by upstream -#usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so.@LLVM_VERSION@.@LLVM_VERSION_MINOR@ usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION@.so diff --git a/debian/llvm-X.Y-dev.links.in b/debian/llvm-X.Y-dev.links.in index b6e0cfd7..55d07e62 100644 --- a/debian/llvm-X.Y-dev.links.in +++ b/debian/llvm-X.Y-dev.links.in @@ -11,3 +11,13 @@ usr/lib/llvm-@LLVM_VERSION@/ usr/lib/llvm-@LLVM_VERSION@/build/Debug+Asserts usr/lib/llvm-@LLVM_VERSION@/lib/cmake/llvm usr/lib/llvm-@LLVM_VERSION@/cmake usr/lib/llvm-@LLVM_VERSION@/lib/cmake/llvm usr/lib/llvm-@LLVM_VERSION@/share/llvm/cmake + +# FIXME: CMake requires this file, but for what? Fix LLVMExports.cmake instead? +# +# CMake Error at /usr/lib/llvm-19/lib/cmake/llvm/LLVMExports.cmake:1908 (message): +# The imported target "LLVM" references the file +# +# "/usr/lib/llvm-19/lib/libLLVM.so.1" +# +# 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