From: LLVM Packaging Team Date: Wed, 1 Apr 2020 15:23:55 +0000 (+0100) Subject: lldb-addversion-suffix-to-llvm-server-exec X-Git-Tag: archive/raspbian/1%9.0.1-12+rpi1^2~42 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d770e986e7c2e6348d3c929c16233dbda5871858;p=llvm-toolchain-9.git 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 --- diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp index 11052eff9..d4f385937 100644 --- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp +++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp @@ -33,13 +33,14 @@ #include "lldb/Utility/StreamString.h" #include "llvm/ADT/SmallString.h" #include "llvm/Support/ScopedPrinter.h" +#include "llvm/Config/llvm-config.h" #include "ProcessGDBRemoteLog.h" #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)