From 7f00e22bc561e42396d1a11ecff39da949f91d4b Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Sat, 7 Jan 2017 15:16:53 +0000
Subject: [PATCH] rename the patch to match what we do with 4.0

---
 ...ddversion-suffix-to-llvm-server-exec.patch | 53 ++++++-------------
 debian/patches/lldb-server-path.diff          | 20 -------
 debian/patches/series                         |  2 +-
 3 files changed, 16 insertions(+), 59 deletions(-)
 delete mode 100644 debian/patches/lldb-server-path.diff

diff --git a/debian/patches/lldb-addversion-suffix-to-llvm-server-exec.patch b/debian/patches/lldb-addversion-suffix-to-llvm-server-exec.patch
index 5490f129..4b96a0a7 100644
--- a/debian/patches/lldb-addversion-suffix-to-llvm-server-exec.patch
+++ b/debian/patches/lldb-addversion-suffix-to-llvm-server-exec.patch
@@ -1,45 +1,22 @@
-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.
-
---- llvm-toolchain-3.9-3.9.orig/CMakeLists.txt
-+++ llvm-toolchain-3.9-3.9/CMakeLists.txt
-@@ -2,6 +2,10 @@
- 
- cmake_minimum_required(VERSION 3.4.3)
- 
-+set(DEBIAN_VERSION_SUFFIX "" CACHE STRING "Versioned program suffix that is required to exec correct subtool.")
-+
-+add_definitions( -DDEBIAN_VERSION_SUFFIX=\"${DEBIAN_VERSION_SUFFIX}\")
-+
- if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
-   message(STATUS "No build type selected, default to Debug")
-   set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "Build type (default Debug)")
---- llvm-toolchain-3.9-3.9.orig/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
-+++ llvm-toolchain-3.9-3.9/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
-@@ -37,10 +37,14 @@
- // Project includes
- #include "ProcessGDBRemoteLog.h"
- 
-+#ifndef DEBIAN_VERSION_SUFFIX
-+#define DEBIAN_VERSION_SUFFIX ""
-+#endif
-+
+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
+@@ -40,7 +40,7 @@
  #if defined(__APPLE__)
  # define DEBUGSERVER_BASENAME    "debugserver"
  #else
 -# define DEBUGSERVER_BASENAME    "lldb-server"
-+# define DEBUGSERVER_BASENAME    "lldb-server" DEBIAN_VERSION_SUFFIX
++# define DEBUGSERVER_BASENAME    "lldb-server-3.9"
  #endif
  
  #if defined (HAVE_LIBCOMPRESSION)
+@@ -1175,7 +1175,7 @@ GDBRemoteCommunication::StartDebugserver
+             }
+         }
+     }
+-    
++    log->Printf("foo %s,  debugserver_file_spec.GetPath ().c_str ());
+     if (debugserver_exists)
+     {
+         debugserver_file_spec.GetPath (debugserver_path, sizeof(debugserver_path));
diff --git a/debian/patches/lldb-server-path.diff b/debian/patches/lldb-server-path.diff
deleted file mode 100644
index b91e29df..00000000
--- a/debian/patches/lldb-server-path.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-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 84c502dd..2921eae7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -42,4 +42,4 @@ 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
+lldb-addversion-suffix-to-llvm-server-exec.patch