llvm: merge in changes from trunk

[nikita <nikita%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	nikita <nikita%NetBSD.org@localhost>
Pushed By:	nikita
Date:		Mon May 15 23:18:16 2023 +0200
Changeset:	c92b6f83ac065fb591fc689ca49068f5321d4160

Modified Files:
	llvm/Makefile
	llvm/PLIST
	llvm/buildlink3.mk
	llvm/options.mk

Log Message:
llvm: merge in changes from trunk

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=c92b6f83ac065fb591fc689ca49068f5321d4160

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 llvm/Makefile      |  3 ++-
 llvm/PLIST         |  2 +-
 llvm/buildlink3.mk |  2 +-
 llvm/options.mk    | 12 ++++++++++--
 4 files changed, 14 insertions(+), 5 deletions(-)

diffs:
diff --git a/llvm/Makefile b/llvm/Makefile
index c4f116c372..7a6c11ecc0 100644
--- a/llvm/Makefile
+++ b/llvm/Makefile
@@ -43,7 +43,6 @@ PYTHON_VERSIONS_INCOMPATIBLE=	27
 NOT_FOR_PLATFORM+=	*-*-alpha
 NOT_FOR_PLATFORM+=	*-*-vax
 
-CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=Release
 CMAKE_ARGS+=	-DCMAKE_C_COMPILER=${CC:Q}
 CMAKE_ARGS+=	-DCMAKE_CXX_COMPILER=${CXX:Q}
 CMAKE_ARGS+=	-DCMAKE_CXX_LINK_FLAGS=${LDFLAGS:Q}
@@ -127,6 +126,8 @@ CXXFLAGS+=	-mno-pltseq
 .  endif
 .endif
 
+PLIST_SUBST+=	RELEASE_TYPE=${RELEASE_TYPE}
+
 .if ${OPSYS} == "NetBSD"
 CMAKE_ARGS+=	-DPKGSRC_LLVM_PTHREADLIB=-lpthread
 .endif
diff --git a/llvm/PLIST b/llvm/PLIST
index 7899c5ebe4..577736d91f 100644
--- a/llvm/PLIST
+++ b/llvm/PLIST
@@ -1967,7 +1967,7 @@ lib/cmake/llvm/LLVMConfig.cmake
 lib/cmake/llvm/LLVMConfigExtensions.cmake
 lib/cmake/llvm/LLVMConfigVersion.cmake
 lib/cmake/llvm/LLVMDistributionSupport.cmake
-lib/cmake/llvm/LLVMExports-release.cmake
+lib/cmake/llvm/LLVMExports-${RELEASE_TYPE}.cmake
 lib/cmake/llvm/LLVMExports.cmake
 lib/cmake/llvm/LLVMExternalProjectUtils.cmake
 lib/cmake/llvm/LLVMInstallSymlink.cmake
diff --git a/llvm/buildlink3.mk b/llvm/buildlink3.mk
index 004f05d38d..597dbdaa0d 100644
--- a/llvm/buildlink3.mk
+++ b/llvm/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	llvm
 LLVM_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.llvm+=	llvm>=16
-BUILDLINK_PKGSRCDIR.llvm?=	../../wip/llvm
+BUILDLINK_PKGSRCDIR.llvm?=	../../lang/llvm
 
 LLVM_CONFIG_PATH?=		${BUILDLINK_PREFIX.llvm}/bin/llvm-config
 
diff --git a/llvm/options.mk b/llvm/options.mk
index dbd2af8ab4..fed1259d4c 100644
--- a/llvm/options.mk
+++ b/llvm/options.mk
@@ -12,7 +12,7 @@ PRINT_PLIST_AWK+=		{if ($$0 ~ /libLLVM${tgt}/) {$$0 = "$${PLIST.${tgt}}" $$0;}}
 PRINT_PLIST_AWK+=		{if ($$0 ~ /libLLVMExegesis${tgt}/) {$$0 = "$${PLIST.${tgt}}" $$0;}}
 .endfor
 
-PKG_SUPPORTED_OPTIONS+=		terminfo z3 tests
+PKG_SUPPORTED_OPTIONS+=		terminfo z3 tests debug
 
 # Terminfo is used for colour output, only enable it by default if terminfo
 # is builtin to avoid unnecessary dependencies which could cause bootstrap
@@ -74,7 +74,15 @@ CMAKE_ARGS+=	-DLLVM_ENABLE_TERMINFO=OFF
 CMAKE_ARGS+=	-DLLVM_ENABLE_Z3_SOLVER=ON
 .endif
 
-.if !empty(PGK_OPTIONS:Mtests)
+.if !empty(PKG_OPTIONS:Mdebug)
+RELEASE_TYPE?=	debug
+CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=Debug
+.else
+CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=Release
+RELEASE_TYPE?=	release
+.endif
+
+.if !empty(PKG_OPTIONS:Mtests)
 # requires "unittes" ?
 CMAKE_ARGS+=	-DLLVM_INCLUDE_TESTS=ON
 .else