mirror of
https://git.proxmox.com/git/llvm-toolchain
synced 2025-08-04 03:05:17 +00:00
libclang: remove the general link + add a check
This commit is contained in:
parent
05d61700e9
commit
82d9043258
3
debian/changelog
vendored
3
debian/changelog
vendored
@ -18,7 +18,8 @@ llvm-toolchain-18 (1:18.1.8-2~exp1) experimental; urgency=medium
|
|||||||
to move the libraries into multi archi directories
|
to move the libraries into multi archi directories
|
||||||
* Bring back libLLVM to be installed in /usr/lib/llvm-18/lib/libLLVM-18.so
|
* Bring back libLLVM to be installed in /usr/lib/llvm-18/lib/libLLVM-18.so
|
||||||
instead of /usr/lib/llvm-18/lib/libLLVM.so
|
instead of /usr/lib/llvm-18/lib/libLLVM.so
|
||||||
This should make the packages co installable again
|
Same for libclang (remove usr/lib/llvm-18/lib/libclang.so.1
|
||||||
|
This should make the packages multiarch co installable again
|
||||||
(Closes: #1067699, #1067005)
|
(Closes: #1067699, #1067005)
|
||||||
(LP: #2063207)
|
(LP: #2063207)
|
||||||
* Introduce the new variable @DEB_HOST_MULTIARCH_LLVM@ in the build system
|
* Introduce the new variable @DEB_HOST_MULTIARCH_LLVM@ in the build system
|
||||||
|
2
debian/libclang1-X.Y.links.in
vendored
2
debian/libclang1-X.Y.links.in
vendored
@ -1,6 +1,4 @@
|
|||||||
# as upstream
|
# as upstream
|
||||||
usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.1
|
usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.1
|
||||||
usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@
|
usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@
|
||||||
usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ usr/lib/llvm-@LLVM_VERSION@/lib/libclang.so.1
|
|
||||||
usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so.1
|
usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so.1
|
||||||
usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ usr/lib/llvm-@LLVM_VERSION@/lib/libclang.so.1
|
|
||||||
|
6
debian/qualify-clang.sh
vendored
6
debian/qualify-clang.sh
vendored
@ -475,6 +475,12 @@ echo '#include <chrono>
|
|||||||
int main() { }' > foo.cpp
|
int main() { }' > foo.cpp
|
||||||
clang++-$VERSION -std=c++11 foo.cpp
|
clang++-$VERSION -std=c++11 foo.cpp
|
||||||
|
|
||||||
|
if test -f /usr/lib/llvm-$VERSION/lib/libclang.so.1; then
|
||||||
|
echo "/usr/lib/llvm-$VERSION/lib/libclang.so.1 found."
|
||||||
|
echo "Break the build as it breaks the coinstalability"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
echo "Testing linking clang-cpp ..."
|
echo "Testing linking clang-cpp ..."
|
||||||
|
|
||||||
clang-$VERSION -lclang-cpp$VERSION -v foo.cpp -o o &> /dev/null || true
|
clang-$VERSION -lclang-cpp$VERSION -v foo.cpp -o o &> /dev/null || true
|
||||||
|
Loading…
Reference in New Issue
Block a user