commit: ea4a2e9336ed805197c758c9d991ac85bcbe7547
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 6 00:06:58 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 6 00:06:58 2019 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=ea4a2e93
kde-frameworks/extra-cmake-modules: Fix detection of >=clazy-1.5
Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../extra-cmake-modules-5.55.0.ebuild | 5 ++-
.../extra-cmake-modules-5.55.0-clazy-1.5.patch | 41 ++++++++++++++++++++++
2 files changed, 45 insertions(+), 1 deletion(-)
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
index 3a8e3d7b38..91fdffe863 100644
--- 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
@@ -33,7 +33,10 @@ RDEPEND="
app-arch/libarchive[bzip2]
"
-PATCHES=( "${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch"
+ "${FILESDIR}/${P}-clazy-1.5.patch"
+)
python_check_deps() {
has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
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
new file mode 100644
index 0000000000..0ac07a60ee
--- /dev/null
+++
b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.55.0-clazy-1.5.patch
@@ -0,0 +1,41 @@
+From ba3341c83b186e021337761e5fd689614fe14177 Mon Sep 17 00:00:00 2001
+From: Elvis Angelaccio <[email protected]>
+Date: Sat, 2 Feb 2019 18:46:27 +0100
+Subject: Fix ENABLE_CLAZY option with clazy >= 1.5
+
+Summary:
+clazy 1.5 renamed its plugin from from `ClangLazy.so` to
+`ClazyPlugin.so` and from `clang-lazy` to `clazy`.
+
+Reviewers: apol, smartins
+
+Subscribers: kde-frameworks-devel, kde-buildsystem
+
+Tags: #frameworks, #build_system
+
+Differential Revision: https://phabricator.kde.org/D18680
+---
+ kde-modules/KDECMakeSettings.cmake | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/kde-modules/KDECMakeSettings.cmake
b/kde-modules/KDECMakeSettings.cmake
+index 3f7f5a8..17d79a0 100644
+--- a/kde-modules/KDECMakeSettings.cmake
++++ b/kde-modules/KDECMakeSettings.cmake
+@@ -293,7 +293,12 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+ option(ENABLE_CLAZY "Enable Clazy warnings" OFF)
+
+ if(ENABLE_CLAZY)
+- set(CMAKE_CXX_COMPILE_OBJECT "${CMAKE_CXX_COMPILE_OBJECT} -Xclang
-load -Xclang ClangLazy${CMAKE_SHARED_LIBRARY_SUFFIX} -Xclang -add-plugin
-Xclang clang-lazy")
++ find_library(CLAZY_v1_5_FOUND
ClazyPlugin${CMAKE_SHARED_LIBRARY_SUFFIX})
++ if(CLAZY_v1_5_FOUND) # clazy >= 1.5
++ set(CMAKE_CXX_COMPILE_OBJECT "${CMAKE_CXX_COMPILE_OBJECT} -Xclang
-load -Xclang ClazyPlugin${CMAKE_SHARED_LIBRARY_SUFFIX} -Xclang -add-plugin
-Xclang clazy")
++ else() # clazy < 1.5
++ set(CMAKE_CXX_COMPILE_OBJECT "${CMAKE_CXX_COMPILE_OBJECT} -Xclang
-load -Xclang ClangLazy${CMAKE_SHARED_LIBRARY_SUFFIX} -Xclang -add-plugin
-Xclang clang-lazy")
++ endif()
+ endif()
+ endif()
+
+--
+cgit v1.1
+
