llvm-toolchain/debian/patches/lldb-addversion-suffix-to-llvm-server-exec.patch
Sylvestre Ledru 18c9c055a5 * New snapshot release
* d/p/0011-SimplifyCFG-Hoisting-invalidates-metadata.patch: Also apply bug 29163
  to fix some issues in rust (Closes: #842956)
  Many thanks to Ximin Luo for the investigation
* libclang-common-4.0-dev: missing multilib binaries for the sanitizer
  libraries (Closes: #841923)
  Many thanks to Norbert Lange for the changes
* d/p/clang-fix-cmpxchg8-detection-on-i386.patch:
  libcxx atomic tests for old i386 fail with wrong Atomic inline width.
  Needed for libc++
  (See https://llvm.org/bugs/show_bug.cgi?id=19355)
* d/p lldb-addversion-suffix-to-llvm-server-exec.patch:
  Fix the lldb-server call in some cases
* LLVMConfig.cmake was installed into wrong location
  Install a symlink from lib/cmake/llvm to share/llvm/cmake
  (Closes: #839234)
* Fix a path issue in scan-view. Thanks Riccardo Magliocchetti
  (Closes: #838572)
* The libstdc++-6-dev & libobjc-6-dev are only install with clang-X.Y
  and libclang-X.Y-dev and no longer with libclang1-X.Y
  (Closes: #841309)
* Team upload
* d/p/drop-wrong-hack-arm64.patch:
  - drop hack that was preventing the package from building on
    non-amd64 64bit architectures:
2016-11-11 17:45:18 +00:00

50 lines
2.1 KiB
Diff

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.
Index: llvm-toolchain-snapshot_4.0~svn286225/CMakeLists.txt
===================================================================
--- llvm-toolchain-snapshot_4.0~svn286225.orig/CMakeLists.txt
+++ llvm-toolchain-snapshot_4.0~svn286225/CMakeLists.txt
@@ -49,6 +49,10 @@ project(LLVM
${cmake_3_0_LANGUAGES}
C CXX ASM)
+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)" FORCE)
Index: llvm-toolchain-snapshot_4.0~svn286225/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
===================================================================
--- llvm-toolchain-snapshot_4.0~svn286225.orig/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
+++ llvm-toolchain-snapshot_4.0~svn286225/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
@@ -36,10 +36,14 @@
// 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"
+# define DEBUGSERVER_BASENAME "lldb-server" DEBIAN_VERSION_SUFFIX
#endif
#if defined(HAVE_LIBCOMPRESSION)