From e0a803917a38c66b40b2b431cc35829d8efed75a Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 8 Jun 2019 09:49:01 +0200 Subject: [PATCH] rebase of the patch --- debian/patches/0044-soname.diff | 16 ++++++++-------- debian/patches/930008-arm.diff | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/debian/patches/0044-soname.diff b/debian/patches/0044-soname.diff index 9db6ad43..a82d12cb 100644 --- a/debian/patches/0044-soname.diff +++ b/debian/patches/0044-soname.diff @@ -3,12 +3,12 @@ tools/llvm-shlib/CMakeLists.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) -Index: llvm-toolchain-snapshot_9~svn355786/clang/tools/libclang/CMakeLists.txt +Index: llvm-toolchain-snapshot_9~svn362869/clang/tools/libclang/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_9~svn355786.orig/clang/tools/libclang/CMakeLists.txt -+++ llvm-toolchain-snapshot_9~svn355786/clang/tools/libclang/CMakeLists.txt -@@ -89,7 +89,7 @@ else() - set(output_name "clang") +--- llvm-toolchain-snapshot_9~svn362869.orig/clang/tools/libclang/CMakeLists.txt ++++ llvm-toolchain-snapshot_9~svn362869/clang/tools/libclang/CMakeLists.txt +@@ -94,7 +94,7 @@ if (UNIX AND ${CMAKE_SYSTEM_NAME} MATCHE + remove_definitions("-D_XOPEN_SOURCE=700") endif() -add_clang_library(libclang ${ENABLE_SHARED} ${ENABLE_STATIC} @@ -16,10 +16,10 @@ Index: llvm-toolchain-snapshot_9~svn355786/clang/tools/libclang/CMakeLists.txt OUTPUT_NAME ${output_name} ${SOURCES} DEPENDS clang-resource-headers -Index: llvm-toolchain-snapshot_9~svn355786/tools/llvm-shlib/CMakeLists.txt +Index: llvm-toolchain-snapshot_9~svn362869/tools/llvm-shlib/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_9~svn355786.orig/tools/llvm-shlib/CMakeLists.txt -+++ llvm-toolchain-snapshot_9~svn355786/tools/llvm-shlib/CMakeLists.txt +--- llvm-toolchain-snapshot_9~svn362869.orig/tools/llvm-shlib/CMakeLists.txt ++++ llvm-toolchain-snapshot_9~svn362869/tools/llvm-shlib/CMakeLists.txt @@ -41,6 +41,8 @@ if(LLVM_BUILD_LLVM_DYLIB) add_llvm_library(LLVM SHARED DISABLE_LLVM_LINK_LLVM_DYLIB SONAME ${SOURCES}) diff --git a/debian/patches/930008-arm.diff b/debian/patches/930008-arm.diff index d2ea156a..1c5b21d8 100644 --- a/debian/patches/930008-arm.diff +++ b/debian/patches/930008-arm.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-8-8.0.1~+rc1/lib/Support/Triple.cpp +Index: llvm-toolchain-snapshot_9~svn362869/lib/Support/Triple.cpp =================================================================== ---- llvm-toolchain-8-8.0.1~+rc1.orig/lib/Support/Triple.cpp -+++ llvm-toolchain-8-8.0.1~+rc1/lib/Support/Triple.cpp -@@ -1620,7 +1620,7 @@ StringRef Triple::getARMCPUForArch(Strin +--- llvm-toolchain-snapshot_9~svn362869.orig/lib/Support/Triple.cpp ++++ llvm-toolchain-snapshot_9~svn362869/lib/Support/Triple.cpp +@@ -1644,7 +1644,7 @@ StringRef Triple::getARMCPUForArch(Strin case llvm::Triple::EABIHF: case llvm::Triple::GNUEABIHF: case llvm::Triple::MuslEABIHF: