From: Sebastien Marie <semarie@kapouay.eu.org>
Subject: devel/c2ffi: switch to llvm/19
To: ports@openbsd.org
Date: Mon, 16 Jun 2025 09:25:21 +0200

Hi,

The following diff is enough to switch c2ffi to llvm/19. I intent to
upstream it.

Comments or OK ?
-- 
Sebastien Marie

diff --git a/devel/c2ffi/Makefile b/devel/c2ffi/Makefile
index 8675b391eb..8b995e2d7b 100644
--- a/devel/c2ffi/Makefile
+++ b/devel/c2ffi/Makefile
@@ -1,6 +1,7 @@
 COMMENT =	extract FFI definitions from C, C++, and Objective C
 
 DISTNAME =	c2ffi-18.1.0.0
+REVISION =	0
 
 GH_ACCOUNT =	rpav
 GH_PROJECT =	c2ffi
@@ -28,7 +29,7 @@
 		lang/clang
 
 # c2ffi has branches for each llvm version, so stick to the targeted one
-MODCLANG_VERSION =	18
+MODCLANG_VERSION =	19
 
 BUILD_DEPENDS +=	devel/llvm/${MODCLANG_VERSION}
 LIB_DEPENDS +=		${MODCLANG_LIB_DEPENDS}
diff --git a/devel/c2ffi/patches/patch-CMakeLists_txt b/devel/c2ffi/patches/patch-CMakeLists_txt
index 79a59d4429..06ec26e942 100644
--- a/devel/c2ffi/patches/patch-CMakeLists_txt
+++ b/devel/c2ffi/patches/patch-CMakeLists_txt
@@ -1,8 +1,18 @@
-link with static libLLVMcore and libLLVMoption instead of whole libLLVM-16.so
+target llvm19 (need to be upstreamed)
+link with static libLLVMcore and libLLVMoption instead of whole libLLVM-NN.so
 
 Index: CMakeLists.txt
 --- CMakeLists.txt.orig
 +++ CMakeLists.txt
+@@ -7,7 +7,7 @@ project(c2ffi)
+ set(SOURCE_ROOT ${CMAKE_CURRENT_SOURCE_DIR})
+ 
+ # Apparently the LLVM package doesn't support ranges
+-find_package(LLVM 18.1.0 CONFIG)
++find_package(LLVM 19.0.0 CONFIG)
+ find_package(Clang REQUIRED CONFIG)
+ 
+ message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
 @@ -64,7 +64,11 @@ target_include_directories(c2ffi PUBLIC
    ${LLVM_INCLUDE_DIRS}
    ${SOURCE_ROOT}/src/include