From 0a9a03a8d27cb3f3f3608da8385b2fc07b5b45b1 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 7 Apr 2020 11:23:47 +0200 Subject: [PATCH] * Reoder the cmake arg * disable-D77574-caused-PR-45453.diff: revert a change to address: https://bugs.llvm.org/show_bug.cgi?id=45453 --- debian/changelog | 7 +- .../disable-D77574-caused-PR-45453.diff | 179 ++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 185 insertions(+), 2 deletions(-) create mode 100644 debian/patches/disable-D77574-caused-PR-45453.diff diff --git a/debian/changelog b/debian/changelog index 3c93fd92..c70ab7b9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,14 @@ -llvm-toolchain-snapshot (1:11~++20200325101830+b58902bc72c-1~exp1) UNRELEASED; urgency=medium +llvm-toolchain-snapshot (1:11~++20200407100707+717a4608676-1~exp1) UNRELEASED; urgency=medium * New snapshot release * Bring back libc++-experimental * remove no-cgi.patch - applied upstream * Also install liblldMachO2.a in liblld + * Reoder the cmake arg + * disable-D77574-caused-PR-45453.diff: revert a change to address: + https://bugs.llvm.org/show_bug.cgi?id=45453 - -- Sylvestre Ledru Wed, 25 Mar 2020 22:21:47 +0100 + -- Sylvestre Ledru Tue, 07 Apr 2020 10:10:24 +0200 llvm-toolchain-snapshot (1:11~++20200307074845+ec1d1f6ae70-1~exp1) experimental; urgency=medium diff --git a/debian/patches/disable-D77574-caused-PR-45453.diff b/debian/patches/disable-D77574-caused-PR-45453.diff new file mode 100644 index 00000000..7640a6a5 --- /dev/null +++ b/debian/patches/disable-D77574-caused-PR-45453.diff @@ -0,0 +1,179 @@ +commit 97aa593a8387586095b7eac12974ba2fdd08f4c3 +Author: Johannes Doerfert +Date: Mon Apr 6 12:39:40 2020 -0500 + + [OpenMP] Fix layering problem with FrontendOpenMP + + Summary: + ASTMatchers is used in various places and it now exposes the + LLVMFrontendOpenMP library to its users without them needing to depend + on it explicitly. + + Reviewers: lebedev.ri + + Subscribers: mgorny, yaxunl, bollu, guansong, martong, cfe-commits + + Tags: #clang + + Differential Revision: https://reviews.llvm.org/D77574 + +Index: llvm-toolchain-snapshot-11~++20200407100707+717a4608676/clang-tools-extra/clang-reorder-fields/CMakeLists.txt +=================================================================== +--- llvm-toolchain-snapshot-11~++20200407100707+717a4608676.orig/clang-tools-extra/clang-reorder-fields/CMakeLists.txt ++++ llvm-toolchain-snapshot-11~++20200407100707+717a4608676/clang-tools-extra/clang-reorder-fields/CMakeLists.txt +@@ -1,4 +1,5 @@ + set(LLVM_LINK_COMPONENTS ++ FrontendOpenMP + support + ) + +Index: llvm-toolchain-snapshot-11~++20200407100707+717a4608676/clang-tools-extra/clang-tidy/openmp/CMakeLists.txt +=================================================================== +--- llvm-toolchain-snapshot-11~++20200407100707+717a4608676.orig/clang-tools-extra/clang-tidy/openmp/CMakeLists.txt ++++ llvm-toolchain-snapshot-11~++20200407100707+717a4608676/clang-tools-extra/clang-tidy/openmp/CMakeLists.txt +@@ -1,4 +1,5 @@ + set(LLVM_LINK_COMPONENTS ++ FrontendOpenMP + Support) + + add_clang_library(clangTidyOpenMPModule +Index: llvm-toolchain-snapshot-11~++20200407100707+717a4608676/clang/lib/ASTMatchers/CMakeLists.txt +=================================================================== +--- llvm-toolchain-snapshot-11~++20200407100707+717a4608676.orig/clang/lib/ASTMatchers/CMakeLists.txt ++++ llvm-toolchain-snapshot-11~++20200407100707+717a4608676/clang/lib/ASTMatchers/CMakeLists.txt +@@ -1,6 +1,7 @@ + add_subdirectory(Dynamic) + + set(LLVM_LINK_COMPONENTS ++ FrontendOpenMP + Support + ) + +@@ -14,5 +15,3 @@ add_clang_library(clangASTMatchers + clangBasic + clangLex + ) +- +-target_link_libraries(clangASTMatchers PUBLIC LLVMFrontendOpenMP) +Index: llvm-toolchain-snapshot-11~++20200407100707+717a4608676/clang/lib/StaticAnalyzer/Checkers/CMakeLists.txt +=================================================================== +--- llvm-toolchain-snapshot-11~++20200407100707+717a4608676.orig/clang/lib/StaticAnalyzer/Checkers/CMakeLists.txt ++++ llvm-toolchain-snapshot-11~++20200407100707+717a4608676/clang/lib/StaticAnalyzer/Checkers/CMakeLists.txt +@@ -1,4 +1,5 @@ + set(LLVM_LINK_COMPONENTS ++ FrontendOpenMP + Support + ) + +Index: llvm-toolchain-snapshot-11~++20200407100707+717a4608676/clang/lib/StaticAnalyzer/Core/CMakeLists.txt +=================================================================== +--- llvm-toolchain-snapshot-11~++20200407100707+717a4608676.orig/clang/lib/StaticAnalyzer/Core/CMakeLists.txt ++++ llvm-toolchain-snapshot-11~++20200407100707+717a4608676/clang/lib/StaticAnalyzer/Core/CMakeLists.txt +@@ -1,4 +1,5 @@ + set(LLVM_LINK_COMPONENTS ++ FrontendOpenMP + Support + ) + +Index: llvm-toolchain-snapshot-11~++20200407100707+717a4608676/clang/lib/Tooling/CMakeLists.txt +=================================================================== +--- llvm-toolchain-snapshot-11~++20200407100707+717a4608676.orig/clang/lib/Tooling/CMakeLists.txt ++++ llvm-toolchain-snapshot-11~++20200407100707+717a4608676/clang/lib/Tooling/CMakeLists.txt +@@ -1,5 +1,6 @@ + set(LLVM_LINK_COMPONENTS + Option ++ FrontendOpenMP + Support + ) + +Index: llvm-toolchain-snapshot-11~++20200407100707+717a4608676/clang/lib/Tooling/Transformer/CMakeLists.txt +=================================================================== +--- llvm-toolchain-snapshot-11~++20200407100707+717a4608676.orig/clang/lib/Tooling/Transformer/CMakeLists.txt ++++ llvm-toolchain-snapshot-11~++20200407100707+717a4608676/clang/lib/Tooling/Transformer/CMakeLists.txt +@@ -1,4 +1,5 @@ + set(LLVM_LINK_COMPONENTS ++ FrontendOpenMP + Support + ) + +Index: llvm-toolchain-snapshot-11~++20200407100707+717a4608676/clang/unittests/AST/CMakeLists.txt +=================================================================== +--- llvm-toolchain-snapshot-11~++20200407100707+717a4608676.orig/clang/unittests/AST/CMakeLists.txt ++++ llvm-toolchain-snapshot-11~++20200407100707+717a4608676/clang/unittests/AST/CMakeLists.txt +@@ -1,4 +1,5 @@ + set(LLVM_LINK_COMPONENTS ++ FrontendOpenMP + Support + ) + +Index: llvm-toolchain-snapshot-11~++20200407100707+717a4608676/clang/unittests/ASTMatchers/CMakeLists.txt +=================================================================== +--- llvm-toolchain-snapshot-11~++20200407100707+717a4608676.orig/clang/unittests/ASTMatchers/CMakeLists.txt ++++ llvm-toolchain-snapshot-11~++20200407100707+717a4608676/clang/unittests/ASTMatchers/CMakeLists.txt +@@ -1,4 +1,5 @@ + set(LLVM_LINK_COMPONENTS ++ FrontendOpenMP + Support + ) + +Index: llvm-toolchain-snapshot-11~++20200407100707+717a4608676/clang/unittests/ASTMatchers/Dynamic/CMakeLists.txt +=================================================================== +--- llvm-toolchain-snapshot-11~++20200407100707+717a4608676.orig/clang/unittests/ASTMatchers/Dynamic/CMakeLists.txt ++++ llvm-toolchain-snapshot-11~++20200407100707+717a4608676/clang/unittests/ASTMatchers/Dynamic/CMakeLists.txt +@@ -1,4 +1,5 @@ + set(LLVM_LINK_COMPONENTS ++ FrontendOpenMP + Support + ) + +Index: llvm-toolchain-snapshot-11~++20200407100707+717a4608676/clang/unittests/Analysis/CMakeLists.txt +=================================================================== +--- llvm-toolchain-snapshot-11~++20200407100707+717a4608676.orig/clang/unittests/Analysis/CMakeLists.txt ++++ llvm-toolchain-snapshot-11~++20200407100707+717a4608676/clang/unittests/Analysis/CMakeLists.txt +@@ -1,4 +1,5 @@ + set(LLVM_LINK_COMPONENTS ++ FrontendOpenMP + Support + ) + +Index: llvm-toolchain-snapshot-11~++20200407100707+717a4608676/clang/unittests/Rename/CMakeLists.txt +=================================================================== +--- llvm-toolchain-snapshot-11~++20200407100707+717a4608676.orig/clang/unittests/Rename/CMakeLists.txt ++++ llvm-toolchain-snapshot-11~++20200407100707+717a4608676/clang/unittests/Rename/CMakeLists.txt +@@ -1,4 +1,5 @@ + set(LLVM_LINK_COMPONENTS ++ FrontendOpenMP + support + ) + +Index: llvm-toolchain-snapshot-11~++20200407100707+717a4608676/clang/unittests/Sema/CMakeLists.txt +=================================================================== +--- llvm-toolchain-snapshot-11~++20200407100707+717a4608676.orig/clang/unittests/Sema/CMakeLists.txt ++++ llvm-toolchain-snapshot-11~++20200407100707+717a4608676/clang/unittests/Sema/CMakeLists.txt +@@ -1,4 +1,5 @@ + set(LLVM_LINK_COMPONENTS ++ FrontendOpenMP + Support + ) + +Index: llvm-toolchain-snapshot-11~++20200407100707+717a4608676/clang/unittests/StaticAnalyzer/CMakeLists.txt +=================================================================== +--- llvm-toolchain-snapshot-11~++20200407100707+717a4608676.orig/clang/unittests/StaticAnalyzer/CMakeLists.txt ++++ llvm-toolchain-snapshot-11~++20200407100707+717a4608676/clang/unittests/StaticAnalyzer/CMakeLists.txt +@@ -1,4 +1,5 @@ + set(LLVM_LINK_COMPONENTS ++ FrontendOpenMP + Support + ) + +Index: llvm-toolchain-snapshot-11~++20200407100707+717a4608676/clang/unittests/Tooling/CMakeLists.txt +=================================================================== +--- llvm-toolchain-snapshot-11~++20200407100707+717a4608676.orig/clang/unittests/Tooling/CMakeLists.txt ++++ llvm-toolchain-snapshot-11~++20200407100707+717a4608676/clang/unittests/Tooling/CMakeLists.txt +@@ -1,5 +1,6 @@ + set(LLVM_LINK_COMPONENTS + ${LLVM_TARGETS_TO_BUILD} ++ FrontendOpenMP + Support + ) + diff --git a/debian/patches/series b/debian/patches/series index 7fba0a28..1ad76708 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -140,3 +140,4 @@ no-z3.patch python3-shebang.patch print-lldb-path.patch +disable-D77574-caused-PR-45453.diff