From 63fb6714727b55140cc0448c3b027ae3873bcc1d Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 31 Jul 2017 08:07:45 +0000 Subject: [PATCH] rebase of the patches --- debian/patches/clang-tidy-run-bin.diff | 8 ++++---- .../patches/disable-llvm-symbolizer-test.diff | 19 +++++++++---------- debian/patches/disable-path-test-failing.diff | 10 +++++----- debian/patches/lldb-missing-install.diff | 14 +++++++------- 4 files changed, 25 insertions(+), 26 deletions(-) diff --git a/debian/patches/clang-tidy-run-bin.diff b/debian/patches/clang-tidy-run-bin.diff index b86c3503..0b9cb9a1 100644 --- a/debian/patches/clang-tidy-run-bin.diff +++ b/debian/patches/clang-tidy-run-bin.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-3.8-3.8.1/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py +Index: llvm-toolchain-snapshot_6.0~svn309541/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py =================================================================== ---- llvm-toolchain-3.8-3.8.1.orig/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py -+++ llvm-toolchain-3.8-3.8.1/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py -@@ -108,10 +108,10 @@ def main(): +--- llvm-toolchain-snapshot_6.0~svn309541.orig/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py ++++ llvm-toolchain-snapshot_6.0~svn309541/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py +@@ -157,10 +157,10 @@ def main(): 'clang-tidy and clang-apply-replacements in ' '$PATH.') parser.add_argument('-clang-tidy-binary', metavar='PATH', diff --git a/debian/patches/disable-llvm-symbolizer-test.diff b/debian/patches/disable-llvm-symbolizer-test.diff index f9491690..96bc94c4 100644 --- a/debian/patches/disable-llvm-symbolizer-test.diff +++ b/debian/patches/disable-llvm-symbolizer-test.diff @@ -11,16 +11,15 @@ Description: Silent a test failing on yakkety amd64 Author: Sylvestre Last-Update: 2016-08-26 -Index: llvm-toolchain-3.9-3.9~+rc1/test/tools/llvm-symbolizer/print_context.c +Index: llvm-toolchain-snapshot_6.0~svn309541/test/tools/llvm-symbolizer/print_context.c =================================================================== ---- llvm-toolchain-3.9-3.9~+rc1.orig/test/tools/llvm-symbolizer/print_context.c -+++ llvm-toolchain-3.9-3.9~+rc1/test/tools/llvm-symbolizer/print_context.c -@@ -1,7 +1,7 @@ - // REQUIRES: x86_64-linux - // RUN: %host_cc -O0 -g %s -o %t 2>&1 - // RUN: %t 2>&1 | llvm-symbolizer -print-source-context-lines=5 -obj=%t | FileCheck %s -- +--- llvm-toolchain-snapshot_6.0~svn309541.orig/test/tools/llvm-symbolizer/print_context.c ++++ llvm-toolchain-snapshot_6.0~svn309541/test/tools/llvm-symbolizer/print_context.c +@@ -13,6 +13,7 @@ int main() { + // RUN: cp %p/Inputs/print_context.o %T + // RUN: cd %T + // RUN: echo "%T/print_context.o 0x0" | llvm-symbolizer -print-source-context-lines=5 | FileCheck %s +// XFAIL: * - #include - int inc(int a) { + // Inputs/print_context.o built with plain -g -c from this source file + // Specifying -Xclang -fdebug-compilation-dir -Xclang . to make the debug info diff --git a/debian/patches/disable-path-test-failing.diff b/debian/patches/disable-path-test-failing.diff index d239a125..60a70d8e 100644 --- a/debian/patches/disable-path-test-failing.diff +++ b/debian/patches/disable-path-test-failing.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_5.0~svn298832/unittests/Support/Path.cpp +Index: llvm-toolchain-snapshot_6.0~svn309541/unittests/Support/Path.cpp =================================================================== ---- llvm-toolchain-snapshot_5.0~svn298832.orig/unittests/Support/Path.cpp -+++ llvm-toolchain-snapshot_5.0~svn298832/unittests/Support/Path.cpp -@@ -472,7 +472,7 @@ protected: +--- llvm-toolchain-snapshot_6.0~svn309541.orig/unittests/Support/Path.cpp ++++ llvm-toolchain-snapshot_6.0~svn309541/unittests/Support/Path.cpp +@@ -473,7 +473,7 @@ protected: errs().flush(); } @@ -11,7 +11,7 @@ Index: llvm-toolchain-snapshot_5.0~svn298832/unittests/Support/Path.cpp }; TEST_F(FileSystemTest, Unique) { -@@ -552,13 +552,13 @@ TEST_F(FileSystemTest, RealPath) { +@@ -553,13 +553,13 @@ TEST_F(FileSystemTest, RealPath) { SmallString<64> HomeDir; bool Result = llvm::sys::path::home_directory(HomeDir); diff --git a/debian/patches/lldb-missing-install.diff b/debian/patches/lldb-missing-install.diff index d8a7b9ae..db2ac3c9 100644 --- a/debian/patches/lldb-missing-install.diff +++ b/debian/patches/lldb-missing-install.diff @@ -1,18 +1,18 @@ -Index: llvm-toolchain-snapshot_5.0~svn294583/lldb/tools/argdumper/CMakeLists.txt +Index: llvm-toolchain-snapshot_6.0~svn309541/lldb/tools/argdumper/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_5.0~svn294583.orig/lldb/tools/argdumper/CMakeLists.txt -+++ llvm-toolchain-snapshot_5.0~svn294583/lldb/tools/argdumper/CMakeLists.txt +--- llvm-toolchain-snapshot_6.0~svn309541.orig/lldb/tools/argdumper/CMakeLists.txt ++++ llvm-toolchain-snapshot_6.0~svn309541/lldb/tools/argdumper/CMakeLists.txt @@ -8,3 +8,5 @@ add_lldb_tool(lldb-argdumper INCLUDE_IN_ lldbUtility ) +install(TARGETS lldb-argdumper + RUNTIME DESTINATION bin) -Index: llvm-toolchain-snapshot_5.0~svn294583/lldb/tools/lldb-server/CMakeLists.txt +Index: llvm-toolchain-snapshot_6.0~svn309541/lldb/tools/lldb-server/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_5.0~svn294583.orig/lldb/tools/lldb-server/CMakeLists.txt -+++ llvm-toolchain-snapshot_5.0~svn294583/lldb/tools/lldb-server/CMakeLists.txt -@@ -79,3 +79,7 @@ add_lldb_tool(lldb-server INCLUDE_IN_FRA +--- llvm-toolchain-snapshot_6.0~svn309541.orig/lldb/tools/lldb-server/CMakeLists.txt ++++ llvm-toolchain-snapshot_6.0~svn309541/lldb/tools/lldb-server/CMakeLists.txt +@@ -90,3 +90,7 @@ add_lldb_tool(lldb-server INCLUDE_IN_FRA ) target_link_libraries(lldb-server ${LLDB_SYSTEM_LIBS})