From fd0b9c499177ce919c9195ef1b727b489340746e Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 20 May 2020 09:41:53 +0200 Subject: [PATCH] Upstream change ad97ccf6b26a29262c9cbf5b3e7f6e84c6dcf55f broke clangd-atomic-cmake.patch causing some undef symbol on i386 and atomic --- debian/changelog | 3 +++ debian/patches/clangd-atomic-cmake.patch | 14 +++++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 98f6cf82..e12a7598 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,9 @@ llvm-toolchain-snapshot (1:11~++20200416103106+997f33cfeec-1~exp1) UNRELEASED; u * New symbol clang_Type_getValueType added * Install usr/lib/llvm-11/lib/cmake/lld/*.cmake in liblld-11-dev + * Upstream change ad97ccf6b26a29262c9cbf5b3e7f6e84c6dcf55f + broke clangd-atomic-cmake.patch causing some undef symbol on + i386 and atomic -- Sylvestre Ledru Thu, 16 Apr 2020 10:34:32 +0200 diff --git a/debian/patches/clangd-atomic-cmake.patch b/debian/patches/clangd-atomic-cmake.patch index 9193035a..8f817737 100644 --- a/debian/patches/clangd-atomic-cmake.patch +++ b/debian/patches/clangd-atomic-cmake.patch @@ -1,7 +1,7 @@ -Index: llvm-toolchain-snapshot_11~++20200430094054+52eb2f65a7d/clang-tools-extra/clangd/CMakeLists.txt +Index: llvm-toolchain-snapshot_11~++20200518084103+b7924d6525b/clang-tools-extra/clangd/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_11~++20200430094054+52eb2f65a7d.orig/clang-tools-extra/clangd/CMakeLists.txt -+++ llvm-toolchain-snapshot_11~++20200430094054+52eb2f65a7d/clang-tools-extra/clangd/CMakeLists.txt +--- llvm-toolchain-snapshot_11~++20200518084103+b7924d6525b.orig/clang-tools-extra/clangd/CMakeLists.txt ++++ llvm-toolchain-snapshot_11~++20200518084103+b7924d6525b/clang-tools-extra/clangd/CMakeLists.txt @@ -27,6 +27,11 @@ set(LLVM_LINK_COMPONENTS FrontendOpenMP ) @@ -14,3 +14,11 @@ Index: llvm-toolchain-snapshot_11~++20200430094054+52eb2f65a7d/clang-tools-extra add_clang_library(clangDaemon AST.cpp ClangdLSPServer.cpp +@@ -114,6 +119,7 @@ add_clang_library(clangDaemon + clangToolingSyntax + clangdSupport + ${LLVM_PTHREAD_LIB} ++ ${CLANGD_ATOMIC_LIB} + ${ALL_CLANG_TIDY_CHECKS} + ) +