mirror of
https://github.com/void-linux/void-packages.git
synced 2025-06-08 16:13:50 +02:00
clazy: update to 1.7
This commit is contained in:
parent
2be5dd6156
commit
b6ef2e3c0f
2 changed files with 3 additions and 75 deletions
|
@ -1,72 +0,0 @@
|
||||||
From df41bd29433937111edca3654a7beb11ec765029 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Johannes Ziegenbalg <Johannes.Ziegenbalg@tu-dresden.de>
|
|
||||||
Date: Fri, 27 Mar 2020 14:18:32 +0100
|
|
||||||
Subject: [PATCH] Fix build issues using llvm 10.0.0
|
|
||||||
|
|
||||||
---
|
|
||||||
CMakeLists.txt | 2 +-
|
|
||||||
src/ClazyStandaloneMain.cpp | 10 ++++++++++
|
|
||||||
src/checks/level0/qstring-ref.cpp | 4 ++++
|
|
||||||
3 files changed, 15 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
||||||
index f1463cfe..a30813f8 100644
|
|
||||||
--- CMakeLists.txt
|
|
||||||
+++ CMakeLists.txt
|
|
||||||
@@ -53,7 +53,7 @@ if(MSVC)
|
|
||||||
# disable trigger-happy warnings from Clang/LLVM headers
|
|
||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4267 /wd4244 /wd4291 /wd4800 /wd4141 /wd4146 /wd4251")
|
|
||||||
elseif(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
|
|
||||||
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-common -Woverloaded-virtual -Wcast-qual -fno-strict-aliasing -pedantic -Wno-long-long -Wall -W -Wno-unused-parameter -Wwrite-strings -fno-exceptions -fno-rtti")
|
|
||||||
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -fno-common -Woverloaded-virtual -Wcast-qual -fno-strict-aliasing -pedantic -Wno-long-long -Wall -W -Wno-unused-parameter -Wwrite-strings -fno-exceptions -fno-rtti")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,-flat_namespace -Wl,-undefined -Wl,suppress")
|
|
||||||
diff --git a/src/ClazyStandaloneMain.cpp b/src/ClazyStandaloneMain.cpp
|
|
||||||
index aada1895..6baae329 100644
|
|
||||||
--- src/ClazyStandaloneMain.cpp
|
|
||||||
+++ src/ClazyStandaloneMain.cpp
|
|
||||||
@@ -93,7 +93,11 @@ class ClazyToolActionFactory
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
+#if LLVM_VERSION_MAJOR >= 10
|
|
||||||
+ std::unique_ptr<FrontendAction> create() override
|
|
||||||
+#else
|
|
||||||
FrontendAction *create() override
|
|
||||||
+#endif
|
|
||||||
{
|
|
||||||
ClazyContext::ClazyOptions options = ClazyContext::ClazyOption_None;
|
|
||||||
|
|
||||||
@@ -116,9 +120,15 @@ class ClazyToolActionFactory
|
|
||||||
options |= ClazyContext::ClazyOption_IgnoreIncludedFiles;
|
|
||||||
|
|
||||||
// TODO: We need to agregate the fixes with previous run
|
|
||||||
+#if LLVM_VERSION_MAJOR >= 10
|
|
||||||
+ return std::make_unique<ClazyStandaloneASTAction>(s_checks.getValue(), s_headerFilter.getValue(),
|
|
||||||
+ s_ignoreDirs.getValue(), s_exportFixes.getValue(),
|
|
||||||
+ m_paths, options);
|
|
||||||
+#else
|
|
||||||
return new ClazyStandaloneASTAction(s_checks.getValue(), s_headerFilter.getValue(),
|
|
||||||
s_ignoreDirs.getValue(), s_exportFixes.getValue(),
|
|
||||||
m_paths, options);
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
std::vector<std::string> m_paths;
|
|
||||||
};
|
|
||||||
diff --git a/src/checks/level0/qstring-ref.cpp b/src/checks/level0/qstring-ref.cpp
|
|
||||||
index d1d8a4ea..ec9e8901 100644
|
|
||||||
--- src/checks/level0/qstring-ref.cpp
|
|
||||||
+++ src/checks/level0/qstring-ref.cpp
|
|
||||||
@@ -117,7 +117,11 @@ static bool containsChild(Stmt *s, Stmt *target)
|
|
||||||
return true;
|
|
||||||
|
|
||||||
if (auto mte = dyn_cast<MaterializeTemporaryExpr>(s)) {
|
|
||||||
+#if LLVM_VERSION_MAJOR >= 10
|
|
||||||
+ return containsChild(mte->getSubExpr(), target);
|
|
||||||
+#else
|
|
||||||
return containsChild(mte->getTemporary(), target);
|
|
||||||
+#endif
|
|
||||||
} else if (auto ice = dyn_cast<ImplicitCastExpr>(s)) {
|
|
||||||
return containsChild(ice->getSubExpr(), target);
|
|
||||||
} else if (auto bte = dyn_cast<CXXBindTemporaryExpr>(s)) {
|
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'clazy'
|
# Template file for 'clazy'
|
||||||
pkgname=clazy
|
pkgname=clazy
|
||||||
version=1.6
|
version=1.7
|
||||||
revision=2
|
revision=1
|
||||||
build_style=cmake
|
build_style=cmake
|
||||||
hostmakedepends="python"
|
hostmakedepends="python"
|
||||||
makedepends="clang llvm"
|
makedepends="clang llvm"
|
||||||
|
@ -10,5 +10,5 @@ maintainer="John <johnz@posteo.net>"
|
||||||
license="LGPL-2.0-or-later"
|
license="LGPL-2.0-or-later"
|
||||||
homepage="https://cgit.kde.org/clazy.git/about/"
|
homepage="https://cgit.kde.org/clazy.git/about/"
|
||||||
distfiles="${KDE_SITE}/clazy/${version}/src/${pkgname}-${version}.tar.xz"
|
distfiles="${KDE_SITE}/clazy/${version}/src/${pkgname}-${version}.tar.xz"
|
||||||
checksum=806d1befaddba82316f4ea34f1cba38bcc7545d0981007e3527c1ff1576dd0de
|
checksum=754da5815f769dd6b72a040a2430525c93f294eb7769c78271603df9614f1b21
|
||||||
nocross="Clang cannot be installed as makedep"
|
nocross="Clang cannot be installed as makedep"
|
||||||
|
|
Loading…
Add table
Reference in a new issue