summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2019-02-09 16:29:50 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2019-02-09 16:30:18 +0100
commit5b18d984c1f305d8dc873d0ed8e5bc3db445d4d4 (patch)
tree3731ff8a31c1fd8b88d92dca6aaea32c78b3f242 /kde-frameworks
parentapp-admin/chroot_safe: Drop old (diff)
downloadgentoo-5b18d984c1f305d8dc873d0ed8e5bc3db445d4d4.tar.gz
gentoo-5b18d984c1f305d8dc873d0ed8e5bc3db445d4d4.tar.bz2
gentoo-5b18d984c1f305d8dc873d0ed8e5bc3db445d4d4.zip
kde-frameworks/extra-cmake-modules: Add missing patch
Package-Manager: Portage-2.3.59, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-frameworks')
-rw-r--r--kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.55.0-clazy-1.5.patch41
1 files changed, 41 insertions, 0 deletions
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 00000000000..0ac07a60ee2
--- /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 <elvis.angelaccio@kde.org>
+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
+