From 8edaa63dab0bcb25c620bba91eb0e0de77a75084 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 7 Jan 2017 14:53:49 +0000 Subject: [PATCH] Fix the path to lldb-server (to lldb-server-3.9) (Closes: #846638) --- debian/changelog | 1 + debian/patches/lldb-server-path.diff | 20 ++++++++++++++++++++ debian/patches/series | 2 +- 3 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 debian/patches/lldb-server-path.diff diff --git a/debian/changelog b/debian/changelog index f12bf68f..cd1ab17a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ llvm-toolchain-3.9 (1:3.9.1-2) unstable; urgency=medium * debian/orig-tar.sh: less verbose * Remove the info section from the generated manpages (Closes: #846269) * Disable libedit usage in lldb because of garbage (Closes: #846616) + * Fix the path to lldb-server (to lldb-server-3.9) (Closes: #846638) -- Sylvestre Ledru Sat, 17 Dec 2016 17:55:44 +0100 diff --git a/debian/patches/lldb-server-path.diff b/debian/patches/lldb-server-path.diff new file mode 100644 index 00000000..b91e29df --- /dev/null +++ b/debian/patches/lldb-server-path.diff @@ -0,0 +1,20 @@ +Index: llvm-toolchain-3.9-3.9.1/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp +=================================================================== +--- llvm-toolchain-3.9-3.9.1.orig/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp ++++ llvm-toolchain-3.9-3.9.1/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp +@@ -37,14 +37,10 @@ + // Project includes + #include "ProcessGDBRemoteLog.h" + +-#ifndef DEBIAN_VERSION_SUFFIX +-#define DEBIAN_VERSION_SUFFIX "" +-#endif +- + #if defined(__APPLE__) + # define DEBUGSERVER_BASENAME "debugserver" + #else +-# define DEBUGSERVER_BASENAME "lldb-server" DEBIAN_VERSION_SUFFIX ++# define DEBUGSERVER_BASENAME "lldb-server-3.9" + #endif + + #if defined (HAVE_LIBCOMPRESSION) diff --git a/debian/patches/series b/debian/patches/series index aaf41b66..84c502dd 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -38,8 +38,8 @@ clang-tidy-run-bin.diff drop-wrong-hack-arm64.patch fix-scan-view-path.diff clang-fix-cmpxchg8-detection-on-i386.patch -lldb-addversion-suffix-to-llvm-server-exec.patch upstream-msan-prevent-initialization-failure.diff upstream-asan-msan-fix-reallocation-logic.diff lit-force-lang.diff clang-arm-default-vfp3-on-armv7a.patch +lldb-server-path.diff