commit:     2cb073ec1e1577919b20fc5cec7c5b40078e5ae8
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 27 23:24:28 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Apr 27 23:28:43 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cb073ec

dev-util/cvise: support LLVM 16

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../{cvise-2.7.0.ebuild => cvise-2.7.0-r1.ebuild}  |  8 ++-
 dev-util/cvise/files/cvise-2.7.0-llvm16.patch      | 68 ++++++++++++++++++++++
 2 files changed, 74 insertions(+), 2 deletions(-)

diff --git a/dev-util/cvise/cvise-2.7.0.ebuild 
b/dev-util/cvise/cvise-2.7.0-r1.ebuild
similarity index 94%
rename from dev-util/cvise/cvise-2.7.0.ebuild
rename to dev-util/cvise/cvise-2.7.0-r1.ebuild
index a432c67a8e92..0c599e87daf6 100644
--- a/dev-util/cvise/cvise-2.7.0.ebuild
+++ b/dev-util/cvise/cvise-2.7.0-r1.ebuild
@@ -20,12 +20,12 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
-LLVM_MAX_SLOT=15
+LLVM_MAX_SLOT=16
 DEPEND="
        || (
+               sys-devel/clang:16
                sys-devel/clang:15
                sys-devel/clang:14
-               sys-devel/clang:13
        )
        <sys-devel/clang-$(( LLVM_MAX_SLOT + 1 )):=
 "
@@ -51,6 +51,10 @@ BDEPEND="
        )
 "
 
+PATCHES=(
+       "${FILESDIR}"/${P}-llvm16.patch
+)
+
 llvm_check_deps() {
        has_version "sys-devel/clang:${LLVM_SLOT}"
 }

diff --git a/dev-util/cvise/files/cvise-2.7.0-llvm16.patch 
b/dev-util/cvise/files/cvise-2.7.0-llvm16.patch
new file mode 100644
index 000000000000..11f0100b6d28
--- /dev/null
+++ b/dev-util/cvise/files/cvise-2.7.0-llvm16.patch
@@ -0,0 +1,68 @@
+https://github.com/marxin/cvise/commit/2f4e1755aa32b131b49606cd55b5bfcc7714a8a8
+
+From 2f4e1755aa32b131b49606cd55b5bfcc7714a8a8 Mon Sep 17 00:00:00 2001
+From: Martin Liska <[email protected]>
+Date: Thu, 26 Jan 2023 09:17:16 +0100
+Subject: [PATCH] bump CMake minimal version
+
+Fixes building with the latest LLVM 16 due to use of IN_LIST operator:
+
+Policy CMP0057 is not set: Support new IN_LIST if() operator.  Run "cmake
+--help-policy CMP0057" for policy details.  Use the cmake_policy command to
+set the policy and suppress this warning.
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -8,7 +8,7 @@
+ 
+ 
###############################################################################
+ 
+-cmake_minimum_required(VERSION 2.8.12)
++cmake_minimum_required(VERSION 3.3)
+ 
+ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
+ 
+--- a/clang_delta/CMakeLists.txt
++++ b/clang_delta/CMakeLists.txt
+@@ -8,7 +8,7 @@
+ 
+ 
###############################################################################
+ 
+-cmake_minimum_required(VERSION 2.8.12)
++cmake_minimum_required(VERSION 3.3)
+ project(clang_delta)
+ 
+ 
###############################################################################
+--- a/clex/CMakeLists.txt
++++ b/clex/CMakeLists.txt
+@@ -8,7 +8,7 @@
+ 
+ 
###############################################################################
+ 
+-cmake_minimum_required(VERSION 2.8.12)
++cmake_minimum_required(VERSION 3.3)
+ 
+ # find_package(FLEX) is done by the topmost "CMakeLists.txt" file.
+ 
+--- a/cvise/CMakeLists.txt
++++ b/cvise/CMakeLists.txt
+@@ -8,7 +8,7 @@
+ 
+ 
###############################################################################
+ 
+-cmake_minimum_required(VERSION 2.8.12)
++cmake_minimum_required(VERSION 3.3)
+ 
+ project(cvise_python)
+ 
+--- a/delta/CMakeLists.txt
++++ b/delta/CMakeLists.txt
+@@ -8,7 +8,7 @@
+ 
+ 
###############################################################################
+ 
+-cmake_minimum_required(VERSION 2.8.12)
++cmake_minimum_required(VERSION 3.3)
+ 
+ # find_package(FLEX) is done by the topmost "CMakeLists.txt" file.
+ 
+

Reply via email to