1 |
commit: 5b18d984c1f305d8dc873d0ed8e5bc3db445d4d4 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Feb 9 15:29:50 2019 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Feb 9 15:30:18 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b18d984 |
7 |
|
8 |
kde-frameworks/extra-cmake-modules: Add missing patch |
9 |
|
10 |
Package-Manager: Portage-2.3.59, Repoman-2.3.12 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
.../extra-cmake-modules-5.55.0-clazy-1.5.patch | 41 ++++++++++++++++++++++ |
14 |
1 file changed, 41 insertions(+) |
15 |
|
16 |
diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.55.0-clazy-1.5.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.55.0-clazy-1.5.patch |
17 |
new file mode 100644 |
18 |
index 00000000000..0ac07a60ee2 |
19 |
--- /dev/null |
20 |
+++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.55.0-clazy-1.5.patch |
21 |
@@ -0,0 +1,41 @@ |
22 |
+From ba3341c83b186e021337761e5fd689614fe14177 Mon Sep 17 00:00:00 2001 |
23 |
+From: Elvis Angelaccio <elvis.angelaccio@×××.org> |
24 |
+Date: Sat, 2 Feb 2019 18:46:27 +0100 |
25 |
+Subject: Fix ENABLE_CLAZY option with clazy >= 1.5 |
26 |
+ |
27 |
+Summary: |
28 |
+clazy 1.5 renamed its plugin from from `ClangLazy.so` to |
29 |
+`ClazyPlugin.so` and from `clang-lazy` to `clazy`. |
30 |
+ |
31 |
+Reviewers: apol, smartins |
32 |
+ |
33 |
+Subscribers: kde-frameworks-devel, kde-buildsystem |
34 |
+ |
35 |
+Tags: #frameworks, #build_system |
36 |
+ |
37 |
+Differential Revision: https://phabricator.kde.org/D18680 |
38 |
+--- |
39 |
+ kde-modules/KDECMakeSettings.cmake | 7 ++++++- |
40 |
+ 1 file changed, 6 insertions(+), 1 deletion(-) |
41 |
+ |
42 |
+diff --git a/kde-modules/KDECMakeSettings.cmake b/kde-modules/KDECMakeSettings.cmake |
43 |
+index 3f7f5a8..17d79a0 100644 |
44 |
+--- a/kde-modules/KDECMakeSettings.cmake |
45 |
++++ b/kde-modules/KDECMakeSettings.cmake |
46 |
+@@ -293,7 +293,12 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") |
47 |
+ option(ENABLE_CLAZY "Enable Clazy warnings" OFF) |
48 |
+ |
49 |
+ if(ENABLE_CLAZY) |
50 |
+- set(CMAKE_CXX_COMPILE_OBJECT "${CMAKE_CXX_COMPILE_OBJECT} -Xclang -load -Xclang ClangLazy${CMAKE_SHARED_LIBRARY_SUFFIX} -Xclang -add-plugin -Xclang clang-lazy") |
51 |
++ find_library(CLAZY_v1_5_FOUND ClazyPlugin${CMAKE_SHARED_LIBRARY_SUFFIX}) |
52 |
++ if(CLAZY_v1_5_FOUND) # clazy >= 1.5 |
53 |
++ set(CMAKE_CXX_COMPILE_OBJECT "${CMAKE_CXX_COMPILE_OBJECT} -Xclang -load -Xclang ClazyPlugin${CMAKE_SHARED_LIBRARY_SUFFIX} -Xclang -add-plugin -Xclang clazy") |
54 |
++ else() # clazy < 1.5 |
55 |
++ set(CMAKE_CXX_COMPILE_OBJECT "${CMAKE_CXX_COMPILE_OBJECT} -Xclang -load -Xclang ClangLazy${CMAKE_SHARED_LIBRARY_SUFFIX} -Xclang -add-plugin -Xclang clang-lazy") |
56 |
++ endif() |
57 |
+ endif() |
58 |
+ endif() |
59 |
+ |
60 |
+-- |
61 |
+cgit v1.1 |
62 |
+ |