diff --git a/debian/changelog b/debian/changelog index 6bf9c0d7..8e1c2ef7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ llvm-toolchain-3.8 (1:3.8.1-13) UNRELEASED; urgency=medium * Fix a version issue with run-clang-tidy-4.0.py + * Updated patch kfreebsd-support.diff -- Sylvestre Ledru Mon, 12 Sep 2016 13:57:25 +0200 diff --git a/debian/patches/kfreebsd-support.diff b/debian/patches/kfreebsd-support.diff index de38cfee..383998b1 100644 --- a/debian/patches/kfreebsd-support.diff +++ b/debian/patches/kfreebsd-support.diff @@ -23,15 +23,18 @@ elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin") --- a/lldb/cmake/LLDBDependencies.cmake +++ b/lldb/cmake/LLDBDependencies.cmake -@@ -153,7 +153,7 @@ if (NOT CMAKE_SYSTEM_NAME MATCHES "Windo +@@ -152,10 +152,7 @@ if (NOT CMAKE_SYSTEM_NAME MATCHES "Windo + endif() endif() endif() - # On FreeBSD/NetBSD backtrace() is provided by libexecinfo, not libc. +-# On FreeBSD/NetBSD backtrace() is provided by libexecinfo, not libc. -if (CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR CMAKE_SYSTEM_NAME MATCHES "NetBSD") -+if ((CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR CMAKE_SYSTEM_NAME MATCHES "NetBSD") AND NOT CMAKE_SYSTEM_NAME STREQUAL "kFreeBSD") - list(APPEND LLDB_SYSTEM_LIBS execinfo) - endif() +- list(APPEND LLDB_SYSTEM_LIBS execinfo) +-endif() ++list(APPEND LLDB_SYSTEM_LIBS ${Backtrace_LIBRARY}) + if (NOT LLDB_DISABLE_PYTHON AND NOT LLVM_BUILD_STATIC) + list(APPEND LLDB_SYSTEM_LIBS ${PYTHON_LIBRARIES}) --- a/lldb/scripts/utilsOsType.py +++ b/lldb/scripts/utilsOsType.py @@ -35,6 +35,7 @@ if sys.version_info.major >= 3: @@ -72,3 +75,11 @@ +if ((CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "GNU" OR CMAKE_SYSTEM_NAME STREQUAL "kFreeBSD") AND NOT __ANDROID_NDK__) add_subdirectory(readline) endif() +--- a/lldb/cmake/modules/LLDBConfig.cmake ++++ b/lldb/cmake/modules/LLDBConfig.cmake +@@ -410,3 +410,5 @@ if (NOT LLDB_DISABLE_CURSES) + list(APPEND system_libs ${CURSES_LIBRARIES}) + include_directories(${CURSES_INCLUDE_DIR}) + endif () ++ ++find_package(Backtrace REQUIRED)