| 1 |
commit: ea4a2e9336ed805197c758c9d991ac85bcbe7547 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Feb 6 00:06:58 2019 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Feb 6 00:06:58 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=ea4a2e93 |
| 7 |
|
| 8 |
kde-frameworks/extra-cmake-modules: Fix detection of >=clazy-1.5 |
| 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.ebuild | 5 ++- |
| 14 |
.../extra-cmake-modules-5.55.0-clazy-1.5.patch | 41 ++++++++++++++++++++++ |
| 15 |
2 files changed, 45 insertions(+), 1 deletion(-) |
| 16 |
|
| 17 |
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.55.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.55.0.ebuild |
| 18 |
index 3a8e3d7b38..91fdffe863 100644 |
| 19 |
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.55.0.ebuild |
| 20 |
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.55.0.ebuild |
| 21 |
@@ -33,7 +33,10 @@ RDEPEND=" |
| 22 |
app-arch/libarchive[bzip2] |
| 23 |
" |
| 24 |
|
| 25 |
-PATCHES=( "${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch" ) |
| 26 |
+PATCHES=( |
| 27 |
+ "${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch" |
| 28 |
+ "${FILESDIR}/${P}-clazy-1.5.patch" |
| 29 |
+) |
| 30 |
|
| 31 |
python_check_deps() { |
| 32 |
has_version "dev-python/sphinx[${PYTHON_USEDEP}]" |
| 33 |
|
| 34 |
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 |
| 35 |
new file mode 100644 |
| 36 |
index 0000000000..0ac07a60ee |
| 37 |
--- /dev/null |
| 38 |
+++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.55.0-clazy-1.5.patch |
| 39 |
@@ -0,0 +1,41 @@ |
| 40 |
+From ba3341c83b186e021337761e5fd689614fe14177 Mon Sep 17 00:00:00 2001 |
| 41 |
+From: Elvis Angelaccio <elvis.angelaccio@×××.org> |
| 42 |
+Date: Sat, 2 Feb 2019 18:46:27 +0100 |
| 43 |
+Subject: Fix ENABLE_CLAZY option with clazy >= 1.5 |
| 44 |
+ |
| 45 |
+Summary: |
| 46 |
+clazy 1.5 renamed its plugin from from `ClangLazy.so` to |
| 47 |
+`ClazyPlugin.so` and from `clang-lazy` to `clazy`. |
| 48 |
+ |
| 49 |
+Reviewers: apol, smartins |
| 50 |
+ |
| 51 |
+Subscribers: kde-frameworks-devel, kde-buildsystem |
| 52 |
+ |
| 53 |
+Tags: #frameworks, #build_system |
| 54 |
+ |
| 55 |
+Differential Revision: https://phabricator.kde.org/D18680 |
| 56 |
+--- |
| 57 |
+ kde-modules/KDECMakeSettings.cmake | 7 ++++++- |
| 58 |
+ 1 file changed, 6 insertions(+), 1 deletion(-) |
| 59 |
+ |
| 60 |
+diff --git a/kde-modules/KDECMakeSettings.cmake b/kde-modules/KDECMakeSettings.cmake |
| 61 |
+index 3f7f5a8..17d79a0 100644 |
| 62 |
+--- a/kde-modules/KDECMakeSettings.cmake |
| 63 |
++++ b/kde-modules/KDECMakeSettings.cmake |
| 64 |
+@@ -293,7 +293,12 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") |
| 65 |
+ option(ENABLE_CLAZY "Enable Clazy warnings" OFF) |
| 66 |
+ |
| 67 |
+ if(ENABLE_CLAZY) |
| 68 |
+- set(CMAKE_CXX_COMPILE_OBJECT "${CMAKE_CXX_COMPILE_OBJECT} -Xclang -load -Xclang ClangLazy${CMAKE_SHARED_LIBRARY_SUFFIX} -Xclang -add-plugin -Xclang clang-lazy") |
| 69 |
++ find_library(CLAZY_v1_5_FOUND ClazyPlugin${CMAKE_SHARED_LIBRARY_SUFFIX}) |
| 70 |
++ if(CLAZY_v1_5_FOUND) # clazy >= 1.5 |
| 71 |
++ set(CMAKE_CXX_COMPILE_OBJECT "${CMAKE_CXX_COMPILE_OBJECT} -Xclang -load -Xclang ClazyPlugin${CMAKE_SHARED_LIBRARY_SUFFIX} -Xclang -add-plugin -Xclang clazy") |
| 72 |
++ else() # clazy < 1.5 |
| 73 |
++ set(CMAKE_CXX_COMPILE_OBJECT "${CMAKE_CXX_COMPILE_OBJECT} -Xclang -load -Xclang ClangLazy${CMAKE_SHARED_LIBRARY_SUFFIX} -Xclang -add-plugin -Xclang clang-lazy") |
| 74 |
++ endif() |
| 75 |
+ endif() |
| 76 |
+ endif() |
| 77 |
+ |
| 78 |
+-- |
| 79 |
+cgit v1.1 |
| 80 |
+ |
Archives