From 499bf683ef64933a3658bdc04f86bc67b84fbc03 Mon Sep 17 00:00:00 2001 From: LLVM Packaging Team Date: Mon, 30 Dec 2019 14:31:05 +0000 Subject: [PATCH] lldb-addversion-suffix-to-llvm-server-exec lldb-server exec users always /usr/bin/lldb-server. Server is required for any debugging with lldb which makes it unusable unless default version package has been installed. Small changes to code and debian/rules allows a workaround for lldb-server start up. To use this one needs to add cmake definition during configure. eg -DDEBIAN_VERSION_SUFFIX=-$(LLVM_VERSION) Better implementation would be to use /usr/share/llvm-$(VERSION)/bin but that change seems to require a big change to the path handling code which could then break something else. This probably should have upstream bug but I couldn't find any existing report. Gbp-Pq: Topic lldb Gbp-Pq: Name lldb-addversion-suffix-to-llvm-server-exec.patch --- .../Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp index c335b6002..45d7938e0 100644 --- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp +++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp @@ -32,6 +32,7 @@ #include "lldb/Utility/StreamString.h" #include "llvm/ADT/SmallString.h" #include "llvm/Support/ScopedPrinter.h" +#include "llvm/Config/llvm-config.h" // Project includes #include "ProcessGDBRemoteLog.h" @@ -39,7 +40,7 @@ #if defined(__APPLE__) #define DEBUGSERVER_BASENAME "debugserver" #else -#define DEBUGSERVER_BASENAME "lldb-server" +# define DEBUGSERVER_BASENAME "lldb-server-" LLVM_VERSION_STRING #endif #if defined(HAVE_LIBCOMPRESSION) -- 2.30.2