From: Laurent Cheylus <foxy@free.fr>
Subject: devel/clang-tools-extra: proposal to add FileCheck tool
To: Ports <ports@openbsd.org>
Cc: rsadowski@openbsd.org
Date: Tue, 10 Sep 2024 10:43:06 +0200

Hi

[cc rsadowski@ as maintainer]

proposal of an update for devel/clang-tools-extra port to add FileCheck tool.
FileCheck (https://llvm.org/docs/CommandGuide/FileCheck.html) is a tool useful for the LLVM testsuite and I would like to add it to the list of tools built and packaged in this port.

- update Makefile:
  * add -DLLVM_BUILD_UTILS=ON and -DLLVM_INSTALL_UTILS=ON for configure
  * add FileCheck in ALL_TARGET
- update pkg/PLIST to add FileCheck

Build and tests OK on current/amd64 with Clang-16.

Comments and tests welcome. And please commit if OK.

Laurent

Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/clang-tools-extra/Makefile,v
diff -u -p -r1.39 Makefile
--- Makefile	7 Aug 2024 20:56:29 -0000	1.39
+++ Makefile	6 Sep 2024 20:45:22 -0000
@@ -17,6 +17,8 @@ LLVM_BASE =	llvm16
 DISTNAME =	llvm-project-${LLVM_V}.src
 PKGNAME=	clang-tools-extra-${LLVM_V}
 
+REVISION =	0
+
 CATEGORIES =	devel
 
 HOMEPAGE =	https://clang.llvm.org/extra/index.html
@@ -26,7 +28,7 @@ MAINTAINER =	Rafael Sadowski <rsadowski@
 # In transition from BSD-ish to Apache 2 + LLVM exceptions
 PERMIT_PACKAGE =	Yes
 
-WANTLIB += ${COMPILER_LIBCXX} c m
+WANTLIB += ${COMPILER_LIBCXX} c m execinfo z
 WANTLIB += llvm${MODCLANG_VERSION}/lib/clang-cpp
 
 SITES =		https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_V}/
@@ -70,6 +72,8 @@ CONFIGURE_ARGS +=	-DLLVM_ENABLE_BACKTRAC
 			-DLLVM_INCLUDE_BENCHMARKS=OFF \
 			-DLLVM_BUILD_LLVM_DYLIB=ON \
 			-DLLVM_LINK_LLVM_DYLIB=ON \
+			-DLLVM_BUILD_UTILS=ON \
+			-DLLVM_INSTALL_UTILS=ON
 
 # Generate documentation in man(1) format
 CONFIGURE_ARGS +=	-DLLVM_ENABLE_SPHINX=ON \
@@ -101,6 +105,7 @@ ALL_TARGET =	clang-change-namespace clan
 ALL_TARGET +=	clang-doc clang-format clang-include-fixer clang-move
 ALL_TARGET +=	clang-query clang-reorder-fields clang-tidy clangd
 ALL_TARGET +=	modularize pp-trace tool-template find-all-symbols
+ALL_TARGET +=	FileCheck
 
 MODCMAKE_LDFLAGS = -L${LOCALBASE}/llvm${MODCLANG_VERSION}/lib
 MODCMAKE_LDFLAGS += -Wl,-rpath=${LOCALBASE}/llvm${MODCLANG_VERSION}/lib
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/clang-tools-extra/pkg/PLIST,v
diff -u -p -r1.7 PLIST
--- pkg/PLIST	27 May 2024 18:14:09 -0000	1.7
+++ pkg/PLIST	6 Sep 2024 20:45:22 -0000
@@ -1,3 +1,4 @@
+@bin bin/FileCheck
 @bin bin/clang-apply-replacements
 @bin bin/clang-change-namespace
 @bin bin/clang-doc