From: LLVM Packaging Team <pkg-llvm-team@lists.alioth.debian.org>
Date: Wed, 18 Oct 2017 14:37:25 +0000 (+0100)
Subject: lldb-addversion-suffix-to-llvm-server-exec
X-Git-Tag: archive/raspbian/1%4.0.1-8+rpi1^2~15
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9f4c1c7b2f5b87af2e5ace71cbd287fe374fe375;p=llvm-toolchain-4.0.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 defination 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: 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 bd87521fe..74785787c 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/Target/Process.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)