From e8f0c74d7e7e18035c41f4438914e6adfb6cf0b5 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 21 Oct 2020 16:25:07 +0200 Subject: [PATCH] rebase of the patches --- ...b-addversion-suffix-to-llvm-server-exec.patch | 6 +++--- debian/patches/lldb/lldb-missing-install.diff | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/debian/patches/lldb/lldb-addversion-suffix-to-llvm-server-exec.patch b/debian/patches/lldb/lldb-addversion-suffix-to-llvm-server-exec.patch index 2e5a8f6d..9313692b 100644 --- a/debian/patches/lldb/lldb-addversion-suffix-to-llvm-server-exec.patch +++ b/debian/patches/lldb/lldb-addversion-suffix-to-llvm-server-exec.patch @@ -12,10 +12,10 @@ which could then break something else. This probably should have upstream bug but I couldn't find any existing report. -Index: llvm-toolchain-snapshot_12~++20200326122000+4673699a470/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp +Index: llvm-toolchain-snapshot_12~++20201021041841+fa5fa63fd14/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp =================================================================== ---- llvm-toolchain-snapshot_12~++20200326122000+4673699a470.orig/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp -+++ llvm-toolchain-snapshot_12~++20200326122000+4673699a470/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp +--- llvm-toolchain-snapshot_12~++20201021041841+fa5fa63fd14.orig/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp ++++ llvm-toolchain-snapshot_12~++20201021041841+fa5fa63fd14/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp @@ -35,6 +35,7 @@ #include "lldb/Utility/StreamString.h" #include "llvm/ADT/SmallString.h" diff --git a/debian/patches/lldb/lldb-missing-install.diff b/debian/patches/lldb/lldb-missing-install.diff index 5d4df479..4f63457a 100644 --- a/debian/patches/lldb/lldb-missing-install.diff +++ b/debian/patches/lldb/lldb-missing-install.diff @@ -1,7 +1,7 @@ -Index: llvm-toolchain-snapshot_12~++20200828094457+db1ec04963c/lldb/tools/argdumper/CMakeLists.txt +Index: llvm-toolchain-snapshot_12~++20201021041841+fa5fa63fd14/lldb/tools/argdumper/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_12~++20200828094457+db1ec04963c.orig/lldb/tools/argdumper/CMakeLists.txt -+++ llvm-toolchain-snapshot_12~++20200828094457+db1ec04963c/lldb/tools/argdumper/CMakeLists.txt +--- llvm-toolchain-snapshot_12~++20201021041841+fa5fa63fd14.orig/lldb/tools/argdumper/CMakeLists.txt ++++ llvm-toolchain-snapshot_12~++20201021041841+fa5fa63fd14/lldb/tools/argdumper/CMakeLists.txt @@ -6,3 +6,6 @@ add_lldb_tool(lldb-argdumper ADD_TO_FRAM ) @@ -9,12 +9,12 @@ Index: llvm-toolchain-snapshot_12~++20200828094457+db1ec04963c/lldb/tools/argdum + +install(TARGETS lldb-argdumper + RUNTIME DESTINATION bin) -Index: llvm-toolchain-snapshot_12~++20200828094457+db1ec04963c/lldb/tools/lldb-server/CMakeLists.txt +Index: llvm-toolchain-snapshot_12~++20201021041841+fa5fa63fd14/lldb/tools/lldb-server/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_12~++20200828094457+db1ec04963c.orig/lldb/tools/lldb-server/CMakeLists.txt -+++ llvm-toolchain-snapshot_12~++20200828094457+db1ec04963c/lldb/tools/lldb-server/CMakeLists.txt -@@ -52,3 +52,7 @@ add_lldb_tool(lldb-server - +--- llvm-toolchain-snapshot_12~++20201021041841+fa5fa63fd14.orig/lldb/tools/lldb-server/CMakeLists.txt ++++ llvm-toolchain-snapshot_12~++20201021041841+fa5fa63fd14/lldb/tools/lldb-server/CMakeLists.txt +@@ -68,3 +68,7 @@ add_dependencies(lldb-server + ) target_include_directories(lldb-server PRIVATE "${LLDB_SOURCE_DIR}/source") target_link_libraries(lldb-server PRIVATE ${LLDB_SYSTEM_LIBS}) +