pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

llvm: updated to 16.0.4 with cmake/build.mk

Module Name:	pkgsrc-wip
Committed By:	Adam <adam%netbsd.org@localhost>
Pushed By:	adam
Date:		Wed May 17 18:36:45 2023 +0200
Changeset:	2478fb881b13ffe07f194d046f1a08324a5acf3a

Modified Files:
	clang-tools-extra/Makefile
	clang-tools-extra/distinfo
	clang/distinfo
	compiler-rt/Makefile
	compiler-rt/distinfo
	libcxx/Makefile
	libcxx/distinfo
	libcxxabi/Makefile
	libcxxabi/distinfo
	libunwind/distinfo
	lld/distinfo
	lldb/Makefile
	lldb/distinfo
	lldb/options.mk
	llvm/distinfo
	llvm/version.mk
	openmp/Makefile
	openmp/distinfo
	polly/Makefile
	polly/distinfo
	wasi-compiler-rt/Makefile
	wasi-libcxx/distinfo

Log Message:
llvm: updated to 16.0.4 with cmake/build.mk

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

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

diffstat:
 clang-tools-extra/Makefile |  3 ++-
 clang-tools-extra/distinfo | 18 +++++++++---------
 clang/distinfo             | 12 ++++++------
 compiler-rt/Makefile       | 16 ++++------------
 compiler-rt/distinfo       | 12 ++++++------
 libcxx/Makefile            |  6 +-----
 libcxx/distinfo            | 18 +++++++++---------
 libcxxabi/Makefile         |  7 ++-----
 libcxxabi/distinfo         | 18 +++++++++---------
 libunwind/distinfo         | 18 +++++++++---------
 lld/distinfo               | 12 ++++++------
 lldb/Makefile              | 11 +++--------
 lldb/distinfo              | 12 ++++++------
 lldb/options.mk            | 32 +++++++++++++++-----------------
 llvm/distinfo              | 12 ++++++------
 llvm/version.mk            |  2 +-
 openmp/Makefile            |  8 +-------
 openmp/distinfo            | 12 ++++++------
 polly/Makefile             | 12 +++---------
 polly/distinfo             | 12 ++++++------
 wasi-compiler-rt/Makefile  |  8 +-------
 wasi-libcxx/distinfo       | 18 +++++++++---------
 22 files changed, 120 insertions(+), 159 deletions(-)

diffs:
diff --git a/clang-tools-extra/Makefile b/clang-tools-extra/Makefile
index c98f1ad95c..abfa99132c 100644
--- a/clang-tools-extra/Makefile
+++ b/clang-tools-extra/Makefile
@@ -1,5 +1,7 @@
 # $NetBSD: Makefile,v 1.24 2023/04/19 08:10:34 adam Exp $
 
+INSTALL_DIRS=	build/tools/extra
+
 .include "../../wip/clang/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/clang/clang-tools-extra/:S/.src//}
@@ -16,7 +18,6 @@ SITES.${CLANG_TOOLS_EXTRA}${EXTRACT_SUFX}= \
 BUILD_TARGET=	clang-change-namespace clang-apply-replacements clang-doc
 BUILD_TARGET+=	clang-include-fixer clang-move clang-query clang-reorder-fields
 BUILD_TARGET+=	clang-tidy clangd modularize pp-trace tool-template
-INSTALL_DIRS=	build/tools/extra
 
 REPLACE_PYTHON+=	tools/extra/clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py
 REPLACE_PYTHON+=	tools/extra/clang-tidy/tool/clang-tidy-diff.py
diff --git a/clang-tools-extra/distinfo b/clang-tools-extra/distinfo
index 44e7cf0336..f445514239 100644
--- a/clang-tools-extra/distinfo
+++ b/clang-tools-extra/distinfo
@@ -1,11 +1,11 @@
 $NetBSD: distinfo,v 1.17 2023/01/12 19:32:53 adam Exp $
 
-BLAKE2s (clang-16.0.3.src.tar.xz) = 053b254572cfa38f64afffe1f076e184475fc2e47bff71b6ef5195ded70cb19f
-SHA512 (clang-16.0.3.src.tar.xz) = 3db2806f1f5155c9df377f0e4b47f200814a2ca84ffd9eda7edafa3a85de76af92b3413388be48918432c5d0592d7d07f2618064ef7e7be7c97c9b29793829b8
-Size (clang-16.0.3.src.tar.xz) = 20355248 bytes
-BLAKE2s (clang-tools-extra-16.0.3.src.tar.xz) = 3c23d5411abf36b3fb84f04a5d7d63878cbe623e2b1fc024837c0ef4abd8d224
-SHA512 (clang-tools-extra-16.0.3.src.tar.xz) = 83d5196b88eaa9fdd1ea75353b59318c64cd002942c68653a81cd40288c5b01b9d6fadabac6a397cd06b955b8413d8940006af723d77cc4035bd9c139189f164
-Size (clang-tools-extra-16.0.3.src.tar.xz) = 3151820 bytes
-BLAKE2s (cmake-16.0.3.src.tar.xz) = e3399f12ca1772ddb70ac856c9a3a57bcd073511ccabb8fa0fbb136ab527bde6
-SHA512 (cmake-16.0.3.src.tar.xz) = 01dd624f5276910760f15062f1f3abf68c6ab66c02a4b683ee739663d3f67c47420d8ce47d79e47144edc6bfcc390ffe37bd01d787186607421e3be7288c8569
-Size (cmake-16.0.3.src.tar.xz) = 9004 bytes
+BLAKE2s (clang-16.0.4.src.tar.xz) = 5c5a067bdf10ef55b0c3f839ae4fd840d51160de817acbe10085c85d89c6a6b5
+SHA512 (clang-16.0.4.src.tar.xz) = d6294897022519900ed037559068ff46fff583903a3266147a7f71a47673d123690cff89730777d40e0ba9f1c086e469c6c845aea04c41890da05ea654bd8ce8
+Size (clang-16.0.4.src.tar.xz) = 20355884 bytes
+BLAKE2s (clang-tools-extra-16.0.4.src.tar.xz) = 902ecbd0b0cc7ea5961e08d315f23d5d4ce2bd7c9efc6ac8c8b5c4263e80a9e6
+SHA512 (clang-tools-extra-16.0.4.src.tar.xz) = f05ada67851332626d11b39b9f43284985028b5613a3d5e3f2c95f4aaacae6f24147a716472b9edf4047de0258e3db55ab11ff12452eeefc525e128f2b0c2217
+Size (clang-tools-extra-16.0.4.src.tar.xz) = 3152012 bytes
+BLAKE2s (cmake-16.0.4.src.tar.xz) = 5a7717df91090665eb73bd06a64a26013efe6f0750b09fbe6979505bae34754a
+SHA512 (cmake-16.0.4.src.tar.xz) = 942f10a5d1e3e48768d62a2595f8670872069ab2065871c786a435ae23108fb263e8c3db906dca0e68aeb8aad00f62f7604cd2f41da9e00f574b6021f846bb9d
+Size (cmake-16.0.4.src.tar.xz) = 9012 bytes
diff --git a/clang/distinfo b/clang/distinfo
index bd31229332..33d93c67cf 100644
--- a/clang/distinfo
+++ b/clang/distinfo
@@ -1,11 +1,11 @@
 $NetBSD: distinfo,v 1.80 2023/01/12 19:32:53 adam Exp $
 
-BLAKE2s (clang-16.0.3.src.tar.xz) = 053b254572cfa38f64afffe1f076e184475fc2e47bff71b6ef5195ded70cb19f
-SHA512 (clang-16.0.3.src.tar.xz) = 3db2806f1f5155c9df377f0e4b47f200814a2ca84ffd9eda7edafa3a85de76af92b3413388be48918432c5d0592d7d07f2618064ef7e7be7c97c9b29793829b8
-Size (clang-16.0.3.src.tar.xz) = 20355248 bytes
-BLAKE2s (cmake-16.0.3.src.tar.xz) = e3399f12ca1772ddb70ac856c9a3a57bcd073511ccabb8fa0fbb136ab527bde6
-SHA512 (cmake-16.0.3.src.tar.xz) = 01dd624f5276910760f15062f1f3abf68c6ab66c02a4b683ee739663d3f67c47420d8ce47d79e47144edc6bfcc390ffe37bd01d787186607421e3be7288c8569
-Size (cmake-16.0.3.src.tar.xz) = 9004 bytes
+BLAKE2s (clang-16.0.4.src.tar.xz) = 5c5a067bdf10ef55b0c3f839ae4fd840d51160de817acbe10085c85d89c6a6b5
+SHA512 (clang-16.0.4.src.tar.xz) = d6294897022519900ed037559068ff46fff583903a3266147a7f71a47673d123690cff89730777d40e0ba9f1c086e469c6c845aea04c41890da05ea654bd8ce8
+Size (clang-16.0.4.src.tar.xz) = 20355884 bytes
+BLAKE2s (cmake-16.0.4.src.tar.xz) = 5a7717df91090665eb73bd06a64a26013efe6f0750b09fbe6979505bae34754a
+SHA512 (cmake-16.0.4.src.tar.xz) = 942f10a5d1e3e48768d62a2595f8670872069ab2065871c786a435ae23108fb263e8c3db906dca0e68aeb8aad00f62f7604cd2f41da9e00f574b6021f846bb9d
+Size (cmake-16.0.4.src.tar.xz) = 9012 bytes
 SHA1 (patch-lib_Basic_Targets_OSTargets.h) = 02533d1de2c92a431d9c5d4567f348deff056b99
 SHA1 (patch-lib_Driver_ToolChain.cpp) = 33a8e346a72893140fde42245e4b108f3a9b9e3e
 SHA1 (patch-lib_Driver_ToolChains_Solaris.cpp) = 39d72a7f6cb9d0780c9fb79de6d032f320cccce3
diff --git a/compiler-rt/Makefile b/compiler-rt/Makefile
index 6ac7e6d132..51cb15c662 100644
--- a/compiler-rt/Makefile
+++ b/compiler-rt/Makefile
@@ -13,39 +13,31 @@ LICENSE=	apache-2.0
 
 NOT_FOR_PLATFORM=	NetBSD-[0-7].*-*
 
-USE_CMAKE=	yes
 USE_LANGUAGES=	c99 c++11
 USE_TOOLS+=	ggrep
 GCC_REQD+=	4.8
 SSP_SUPPORTED=	no
 
-CONFIGURE_DIRS=	${WRKDIR}/build
-CMAKE_ARG_PATH=	${WRKSRC}
-
-OS_DIR=		${OPSYS:tl}
-
 CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=Release
 CMAKE_ARGS+=	-DCOMPILER_RT_TEST_COMPILER=${PKG_CC:Q}
-CMAKE_ARGS+=	-DCOMPILER_RT_OS_DIR:STRING=${OS_DIR}
+CMAKE_ARGS+=	-DCOMPILER_RT_OS_DIR:STRING=${OPSYS:tl}
 CMAKE_ARGS+=	-DCOMPILER_RT_INSTALL_PATH:STRING=lib/clang/${PKGVERSION_NOREV}
 CMAKE_ARGS+=	-DLLVM_CONFIG_PATH=${LLVM_CONFIG_PATH:Q}
 CMAKE_ARGS+=	-DCOMPILER_RT_ENABLE_IOS=OFF
 
 TEST_TARGET=	check-compiler-rt
 
-GENERATE_PLIST+=	find ${DESTDIR}${PREFIX} \( -type f -o -type l \) -print | \
-			sed 's,${DESTDIR}${PREFIX}/,,' | ${SORT} ;
+GENERATE_PLIST+=	${FIND} ${DESTDIR}${PREFIX} \( -type f -o -type l \) -print | \
+			${SED} 's,${DESTDIR}${PREFIX}/,,' | ${SORT} ;
 
 PYTHON_FOR_BUILD_ONLY=	yes
 
-post-extract:
-	${MKDIR} ${WRKDIR}/build
-
 post-install:
 	cd ${DESTDIR}${PREFIX} && \
 	${FIND} lib/clang/${PKGVERSION_NOREV} -type f -name '*.dylib' \
 		-exec install_name_tool -id ${PREFIX}/{} {} \;
 
+.include "../../devel/cmake/build.mk"
 .include "../../devel/googletest/buildlink3.mk"
 .include "../../wip/llvm/buildlink3.mk"
 .include "../../lang/python/tool.mk"
diff --git a/compiler-rt/distinfo b/compiler-rt/distinfo
index 21c03fe753..351b46a69c 100644
--- a/compiler-rt/distinfo
+++ b/compiler-rt/distinfo
@@ -1,11 +1,11 @@
 $NetBSD: distinfo,v 1.23 2023/03/03 09:53:14 wiz Exp $
 
-BLAKE2s (cmake-16.0.3.src.tar.xz) = e3399f12ca1772ddb70ac856c9a3a57bcd073511ccabb8fa0fbb136ab527bde6
-SHA512 (cmake-16.0.3.src.tar.xz) = 01dd624f5276910760f15062f1f3abf68c6ab66c02a4b683ee739663d3f67c47420d8ce47d79e47144edc6bfcc390ffe37bd01d787186607421e3be7288c8569
-Size (cmake-16.0.3.src.tar.xz) = 9004 bytes
-BLAKE2s (compiler-rt-16.0.3.src.tar.xz) = dad39e8f7f8103cc4e16638b106af9bdfb144b0517ec10f49079855f5f2dceff
-SHA512 (compiler-rt-16.0.3.src.tar.xz) = 29f41b282f4dc46d75588ba639925695c9cd1413e2a6f2001cdf9a187e3c9183a4b2dd4c43eb861684fc1ecb428143affcb83665b05b13a7c37d28eadef3fbec
-Size (compiler-rt-16.0.3.src.tar.xz) = 2359672 bytes
+BLAKE2s (cmake-16.0.4.src.tar.xz) = 5a7717df91090665eb73bd06a64a26013efe6f0750b09fbe6979505bae34754a
+SHA512 (cmake-16.0.4.src.tar.xz) = 942f10a5d1e3e48768d62a2595f8670872069ab2065871c786a435ae23108fb263e8c3db906dca0e68aeb8aad00f62f7604cd2f41da9e00f574b6021f846bb9d
+Size (cmake-16.0.4.src.tar.xz) = 9012 bytes
+BLAKE2s (compiler-rt-16.0.4.src.tar.xz) = 55f412ee2c620ef249c65779d63b0431b3fae0d6f8d941cf78d0a043d594a050
+SHA512 (compiler-rt-16.0.4.src.tar.xz) = 52266daa9f0d4eb31f352587291ac14ddb4133170bccb40ebbbcc73ffa29d94528887eca5fd3486e8cd8ab9647b75375c40f8a25f4eb2b88dc5dac0306faffc3
+Size (compiler-rt-16.0.4.src.tar.xz) = 2358756 bytes
 SHA1 (patch-cmake_config-ix.cmake) = 40ee86393c0f9e26eeaa493c5312d2cabf4c2a58
 SHA1 (patch-lib_asan_CMakeLists.txt) = f91335b88c8c28a25d7dfada85769f799660f82a
 SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cpp) = 708b4def299a1cc47fca3c48f70745f8528c0fb8
diff --git a/libcxx/Makefile b/libcxx/Makefile
index d0a605a907..aaaf1a5f6a 100644
--- a/libcxx/Makefile
+++ b/libcxx/Makefile
@@ -21,11 +21,7 @@ EXTRA_DIST+=	${LIBCXXABI}${EXTRACT_SUFX}
 SITES.${LIBCXXABI}${EXTRACT_SUFX}=	\
 	${MASTER_SITES:=${GITHUB_PROJECT}/releases/download/${GITHUB_RELEASE}/}
 
-CONFIGURE_DIRS=	build
-CMAKE_ARG_PATH=	${WRKSRC}
-
 USE_LANGUAGES=	c c++20
-USE_CMAKE=	yes
 SSP_SUPPORTED=	no
 GCC_REQD+=	12
 
@@ -48,9 +44,9 @@ CXXFLAGS+=		-std=c++17 -D_LIBCPP_STD_VER=17
 .endif
 
 post-extract:
-	${MKDIR} ${WRKSRC}/build
 	${LN} -f -s ${WRKDIR}/${LIBCXXABI} ${WRKDIR}/libcxxabi
 
+.include "../../devel/cmake/build.mk"
 .include "../../wip/libcxxabi/buildlink3.mk"
 .include "../../wip/libunwind/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/libcxx/distinfo b/libcxx/distinfo
index d0441b040b..529615d64c 100644
--- a/libcxx/distinfo
+++ b/libcxx/distinfo
@@ -1,14 +1,14 @@
 $NetBSD: distinfo,v 1.25 2023/01/12 19:32:54 adam Exp $
 
-BLAKE2s (cmake-16.0.3.src.tar.xz) = e3399f12ca1772ddb70ac856c9a3a57bcd073511ccabb8fa0fbb136ab527bde6
-SHA512 (cmake-16.0.3.src.tar.xz) = 01dd624f5276910760f15062f1f3abf68c6ab66c02a4b683ee739663d3f67c47420d8ce47d79e47144edc6bfcc390ffe37bd01d787186607421e3be7288c8569
-Size (cmake-16.0.3.src.tar.xz) = 9004 bytes
-BLAKE2s (libcxx-16.0.3.src.tar.xz) = 13a8782c80c7b3c6602155bd55edc4953b206ea8999dfe237b0871ef7ec36357
-SHA512 (libcxx-16.0.3.src.tar.xz) = a72cf785e9b0cbbc9abe563fd4a42991b5bd9e9797246696f5ac06372af56d4f7ff4925aa086c9b726761db769a995004d147e7105d638f9908d0d0cf969aa79
-Size (libcxx-16.0.3.src.tar.xz) = 3655980 bytes
-BLAKE2s (libcxxabi-16.0.3.src.tar.xz) = 02c4ecfe5e3e62749d8ecb68b4713b6d57ca32f536c3869a7cbc7d438e6c2467
-SHA512 (libcxxabi-16.0.3.src.tar.xz) = 84947b4d9f4d32b619c78e35e84758b95ec1f16af31a817c84c17438d79f1ff6938fa5c30dd20e6a76ab43051d3e842d238366a780a135a35e8b980becc8869f
-Size (libcxxabi-16.0.3.src.tar.xz) = 573640 bytes
+BLAKE2s (cmake-16.0.4.src.tar.xz) = 5a7717df91090665eb73bd06a64a26013efe6f0750b09fbe6979505bae34754a
+SHA512 (cmake-16.0.4.src.tar.xz) = 942f10a5d1e3e48768d62a2595f8670872069ab2065871c786a435ae23108fb263e8c3db906dca0e68aeb8aad00f62f7604cd2f41da9e00f574b6021f846bb9d
+Size (cmake-16.0.4.src.tar.xz) = 9012 bytes
+BLAKE2s (libcxx-16.0.4.src.tar.xz) = f1068e578400f84cfa95da79c154762a086e36c3fe6f5bee58376c22e3b5f2a9
+SHA512 (libcxx-16.0.4.src.tar.xz) = 1db5be23edfa0d4ec41d310bb56e1a9b522840d4151adaa459475e8f2700b220b46c3e0ada7f58defd0e484066557d31351fd6cdba4661063ce6ac2aca5d41f2
+Size (libcxx-16.0.4.src.tar.xz) = 3644736 bytes
+BLAKE2s (libcxxabi-16.0.4.src.tar.xz) = cfa1424e3fbc7ea6384f131da4274bcc961188f6c1d326283a8cffdd0266d9e7
+SHA512 (libcxxabi-16.0.4.src.tar.xz) = 1788561d031c55772aacc9498975cc9843c36dde32e2821fe0c0188a6cf4f0ad14a5fb7d7d8cef1e314d04e582a5f716f2143bffbf95c1898a5106fd162c20c9
+Size (libcxxabi-16.0.4.src.tar.xz) = 573596 bytes
 SHA1 (patch-include_____locale) = 2eafcf7f70f67df907593fe8cc0cc1ec1c0e0552
 SHA1 (patch-include_____support_solaris_xlocale.h) = c6a969ed48b4df78401fea76c7a936c258cf869f
 SHA1 (patch-src_charconv.cpp) = b8569ae77df4a5a7b627b3a9cb6691be73699dca
diff --git a/libcxxabi/Makefile b/libcxxabi/Makefile
index d1aae56e54..48ecb38527 100644
--- a/libcxxabi/Makefile
+++ b/libcxxabi/Makefile
@@ -21,11 +21,8 @@ EXTRA_DIST+=	${LIBCXX}${EXTRACT_SUFX}
 SITES.${LIBCXX}${EXTRACT_SUFX}=	\
 	${MASTER_SITES:=${GITHUB_PROJECT}/releases/download/${GITHUB_RELEASE}/}
 
-CONFIGURE_DIRS=	build
-CMAKE_ARG_PATH=	${WRKSRC}
 
 USE_LANGUAGES=	c c++17
-USE_CMAKE=	yes
 SSP_SUPPORTED=	no
 GCC_REQD+=	12	# must be in sync with libcxx
 
@@ -38,15 +35,15 @@ CXXFLAGS.NetBSD+=	-D__DEFINED_max_align_t=1
 
 .if !empty(CC_VERSION:Mgcc-[0-9].*) || !empty(CC_VERSION:Mgcc-10.*)
 # Avoid GCC < 11 error https://github.com/llvm/llvm-project/issues/54018
-CXXFLAGS+=		-std=c++17 -D_LIBCPP_STD_VER=17
+CXXFLAGS+=	-std=c++17 -D_LIBCPP_STD_VER=17
 .endif
 
 post-extract:
-	${MKDIR} ${WRKSRC}/build
 	${LN} -f -s ${WRKDIR}/${LIBCXX} ${WRKDIR}/libcxx
 # TODO: not sure what should create this and with which contents
 	${TOUCH} ${WRKDIR}/${LIBCXX}/include/__config_site
 
+.include "../../devel/cmake/build.mk"
 .include "../../wip/libunwind/buildlink3.mk"
 .include "../../wip/llvm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/libcxxabi/distinfo b/libcxxabi/distinfo
index 371c9c6317..039db10280 100644
--- a/libcxxabi/distinfo
+++ b/libcxxabi/distinfo
@@ -1,13 +1,13 @@
 $NetBSD: distinfo,v 1.21 2023/01/12 19:32:54 adam Exp $
 
-BLAKE2s (cmake-16.0.3.src.tar.xz) = e3399f12ca1772ddb70ac856c9a3a57bcd073511ccabb8fa0fbb136ab527bde6
-SHA512 (cmake-16.0.3.src.tar.xz) = 01dd624f5276910760f15062f1f3abf68c6ab66c02a4b683ee739663d3f67c47420d8ce47d79e47144edc6bfcc390ffe37bd01d787186607421e3be7288c8569
-Size (cmake-16.0.3.src.tar.xz) = 9004 bytes
-BLAKE2s (libcxx-16.0.3.src.tar.xz) = 13a8782c80c7b3c6602155bd55edc4953b206ea8999dfe237b0871ef7ec36357
-SHA512 (libcxx-16.0.3.src.tar.xz) = a72cf785e9b0cbbc9abe563fd4a42991b5bd9e9797246696f5ac06372af56d4f7ff4925aa086c9b726761db769a995004d147e7105d638f9908d0d0cf969aa79
-Size (libcxx-16.0.3.src.tar.xz) = 3655980 bytes
-BLAKE2s (libcxxabi-16.0.3.src.tar.xz) = 02c4ecfe5e3e62749d8ecb68b4713b6d57ca32f536c3869a7cbc7d438e6c2467
-SHA512 (libcxxabi-16.0.3.src.tar.xz) = 84947b4d9f4d32b619c78e35e84758b95ec1f16af31a817c84c17438d79f1ff6938fa5c30dd20e6a76ab43051d3e842d238366a780a135a35e8b980becc8869f
-Size (libcxxabi-16.0.3.src.tar.xz) = 573640 bytes
+BLAKE2s (cmake-16.0.4.src.tar.xz) = 5a7717df91090665eb73bd06a64a26013efe6f0750b09fbe6979505bae34754a
+SHA512 (cmake-16.0.4.src.tar.xz) = 942f10a5d1e3e48768d62a2595f8670872069ab2065871c786a435ae23108fb263e8c3db906dca0e68aeb8aad00f62f7604cd2f41da9e00f574b6021f846bb9d
+Size (cmake-16.0.4.src.tar.xz) = 9012 bytes
+BLAKE2s (libcxx-16.0.4.src.tar.xz) = f1068e578400f84cfa95da79c154762a086e36c3fe6f5bee58376c22e3b5f2a9
+SHA512 (libcxx-16.0.4.src.tar.xz) = 1db5be23edfa0d4ec41d310bb56e1a9b522840d4151adaa459475e8f2700b220b46c3e0ada7f58defd0e484066557d31351fd6cdba4661063ce6ac2aca5d41f2
+Size (libcxx-16.0.4.src.tar.xz) = 3644736 bytes
+BLAKE2s (libcxxabi-16.0.4.src.tar.xz) = cfa1424e3fbc7ea6384f131da4274bcc961188f6c1d326283a8cffdd0266d9e7
+SHA512 (libcxxabi-16.0.4.src.tar.xz) = 1788561d031c55772aacc9498975cc9843c36dde32e2821fe0c0188a6cf4f0ad14a5fb7d7d8cef1e314d04e582a5f716f2143bffbf95c1898a5106fd162c20c9
+Size (libcxxabi-16.0.4.src.tar.xz) = 573596 bytes
 SHA1 (patch-src_CMakeLists.txt) = da127de7603ed0ea5530c4a8cd2ffcee61d2ff90
 SHA1 (patch-src_demangle_Utility.h) = 7a4850869f9f4ce858d2cceeb999934c28292a95
diff --git a/libunwind/distinfo b/libunwind/distinfo
index 9ee2453621..1128d63743 100644
--- a/libunwind/distinfo
+++ b/libunwind/distinfo
@@ -1,12 +1,12 @@
 $NetBSD: distinfo,v 1.32 2023/01/12 22:47:25 wiz Exp $
 
-BLAKE2s (cmake-16.0.3.src.tar.xz) = e3399f12ca1772ddb70ac856c9a3a57bcd073511ccabb8fa0fbb136ab527bde6
-SHA512 (cmake-16.0.3.src.tar.xz) = 01dd624f5276910760f15062f1f3abf68c6ab66c02a4b683ee739663d3f67c47420d8ce47d79e47144edc6bfcc390ffe37bd01d787186607421e3be7288c8569
-Size (cmake-16.0.3.src.tar.xz) = 9004 bytes
-BLAKE2s (libcxx-16.0.3.src.tar.xz) = 13a8782c80c7b3c6602155bd55edc4953b206ea8999dfe237b0871ef7ec36357
-SHA512 (libcxx-16.0.3.src.tar.xz) = a72cf785e9b0cbbc9abe563fd4a42991b5bd9e9797246696f5ac06372af56d4f7ff4925aa086c9b726761db769a995004d147e7105d638f9908d0d0cf969aa79
-Size (libcxx-16.0.3.src.tar.xz) = 3655980 bytes
-BLAKE2s (libunwind-16.0.3.src.tar.xz) = ef9a6868aefce379ff05d5cc0b36799bdcfc8284e390cb989bbdd62a00acb653
-SHA512 (libunwind-16.0.3.src.tar.xz) = e4b10c9bee4159db46f0db8852ebeabad31f4cef41cd63a5affa407601367071987e97d3d1d9daf7c57abf189d3a29bd863536f9fa95d9bf481474ed2ed2d632
-Size (libunwind-16.0.3.src.tar.xz) = 115016 bytes
+BLAKE2s (cmake-16.0.4.src.tar.xz) = 5a7717df91090665eb73bd06a64a26013efe6f0750b09fbe6979505bae34754a
+SHA512 (cmake-16.0.4.src.tar.xz) = 942f10a5d1e3e48768d62a2595f8670872069ab2065871c786a435ae23108fb263e8c3db906dca0e68aeb8aad00f62f7604cd2f41da9e00f574b6021f846bb9d
+Size (cmake-16.0.4.src.tar.xz) = 9012 bytes
+BLAKE2s (libcxx-16.0.4.src.tar.xz) = f1068e578400f84cfa95da79c154762a086e36c3fe6f5bee58376c22e3b5f2a9
+SHA512 (libcxx-16.0.4.src.tar.xz) = 1db5be23edfa0d4ec41d310bb56e1a9b522840d4151adaa459475e8f2700b220b46c3e0ada7f58defd0e484066557d31351fd6cdba4661063ce6ac2aca5d41f2
+Size (libcxx-16.0.4.src.tar.xz) = 3644736 bytes
+BLAKE2s (libunwind-16.0.4.src.tar.xz) = 0fd26e35cb54fc9a6ec5391d82a14e203aad56843324fd5a9786a6cde7a80276
+SHA512 (libunwind-16.0.4.src.tar.xz) = 8f0935094a3a9b31f0f174bf2c176ff18ccc1786d4ef370cc130282c009e15373c5a06f218e690be7ee3c6d4eb1d83046dffc6f3f666684ed96486b0524b6034
+Size (libunwind-16.0.4.src.tar.xz) = 115064 bytes
 SHA1 (patch-src_CMakeLists.txt) = a8ac316fddf0d71c75d7f64695335a6f4842fead
diff --git a/lld/distinfo b/lld/distinfo
index 22001693dd..9df9107f0e 100644
--- a/lld/distinfo
+++ b/lld/distinfo
@@ -1,11 +1,11 @@
 $NetBSD: distinfo,v 1.21 2023/01/12 19:32:53 adam Exp $
 
-BLAKE2s (cmake-16.0.3.src.tar.xz) = e3399f12ca1772ddb70ac856c9a3a57bcd073511ccabb8fa0fbb136ab527bde6
-SHA512 (cmake-16.0.3.src.tar.xz) = 01dd624f5276910760f15062f1f3abf68c6ab66c02a4b683ee739663d3f67c47420d8ce47d79e47144edc6bfcc390ffe37bd01d787186607421e3be7288c8569
-Size (cmake-16.0.3.src.tar.xz) = 9004 bytes
-BLAKE2s (lld-16.0.3.src.tar.xz) = 4485fc841be79c07618354dbdbd8c25a8c14f7c734bdd130670bcc5a19a8116d
-SHA512 (lld-16.0.3.src.tar.xz) = 60c072b3640f0aa5a268b84a679d107aab31931a24eedd9900395c4adde3c32a95c845ce705855b64770961a807451066da4e9fa151c6b41e879f81b00dac73b
-Size (lld-16.0.3.src.tar.xz) = 1453536 bytes
+BLAKE2s (cmake-16.0.4.src.tar.xz) = 5a7717df91090665eb73bd06a64a26013efe6f0750b09fbe6979505bae34754a
+SHA512 (cmake-16.0.4.src.tar.xz) = 942f10a5d1e3e48768d62a2595f8670872069ab2065871c786a435ae23108fb263e8c3db906dca0e68aeb8aad00f62f7604cd2f41da9e00f574b6021f846bb9d
+Size (cmake-16.0.4.src.tar.xz) = 9012 bytes
+BLAKE2s (lld-16.0.4.src.tar.xz) = f391c1d3aaecb5ea4d7dd3921f92744dee07f5414a1405ec02ba92c3b85a4af8
+SHA512 (lld-16.0.4.src.tar.xz) = 7bc4c4cf08079fa6c870b340425d117850fd70f57328177461081c6b8077d3805ab5e49fb3ffedf9b34eef3f7fa5a6433720380a9a268e16bde1f0dcc18f09ec
+Size (lld-16.0.4.src.tar.xz) = 1453464 bytes
 SHA1 (patch-CMakeLists.txt) = afcd342966b989026b39445645807e6a541b351e
 SHA1 (patch-ELF_Config.h) = 50861ef74c2ff9a9091afcbc8d076e379d9531e5
 SHA1 (patch-ELF_Options.td) = c81907d6e5e099ed2c26de972c6744b7197de3d3
diff --git a/lldb/Makefile b/lldb/Makefile
index 5ff92d4e91..fee88c23ba 100644
--- a/lldb/Makefile
+++ b/lldb/Makefile
@@ -16,10 +16,6 @@ DEPENDS+=	clang-${PKGVERSION_NOREV}{,nb*}:../../wip/clang
 DEPENDS+=	swig3>=3.0:../../devel/swig3
 DEPENDS+=	${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 
-CONFIGURE_DIRS=		build
-CMAKE_ARG_PATH=		${WRKSRC}
-
-USE_CMAKE=		yes
 USE_LANGUAGES=		c c++14
 GCC_REQD+=		7
 PY_PATCHPLIST=		yes
@@ -70,11 +66,9 @@ PKG_FAIL_REASON+=	"Only NetBSD >= 9.99.22 provides ptrace(2) PT_STOP"
 # Not yet ported, so avoid wasting time trying...
 NOT_FOR_PLATFORM+=	NetBSD-*-powerpc
 
-post-extract:
-	${MKDIR} ${WRKSRC}/build
-
+.include "../../devel/cmake/build.mk"
 #.include "../../devel/googletest/buildlink3.mk" # check-lldb-unit
-.include "../../mk/atomic64.mk"
+.include "../../devel/editline/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../wip/clang/buildlink3.mk"
 .include "../../wip/llvm/buildlink3.mk"
@@ -83,6 +77,7 @@ post-extract:
 .include "../../lang/python/extension.mk"
 .include "../../lang/python/tool.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
+.include "../../mk/atomic64.mk"
 # TODO: sync the readline option with other llvm packages
 .include "../../mk/readline.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lldb/distinfo b/lldb/distinfo
index c09c722a6b..7d8b0f339b 100644
--- a/lldb/distinfo
+++ b/lldb/distinfo
@@ -1,11 +1,11 @@
 $NetBSD: distinfo,v 1.35 2023/01/12 19:32:53 adam Exp $
 
-BLAKE2s (cmake-16.0.3.src.tar.xz) = e3399f12ca1772ddb70ac856c9a3a57bcd073511ccabb8fa0fbb136ab527bde6
-SHA512 (cmake-16.0.3.src.tar.xz) = 01dd624f5276910760f15062f1f3abf68c6ab66c02a4b683ee739663d3f67c47420d8ce47d79e47144edc6bfcc390ffe37bd01d787186607421e3be7288c8569
-Size (cmake-16.0.3.src.tar.xz) = 9004 bytes
-BLAKE2s (lldb-16.0.3.src.tar.xz) = 33bc5e556ca128f757257b4ebdc5e7d1220420f7cd80c7f69455c1a3a09ab2e5
-SHA512 (lldb-16.0.3.src.tar.xz) = 0ea264f371a79975d9c5c406b8b4cef0c42e957bc37d09a29adbd1c1a683499f3a52bc7361b902ed0c654f1abb8818434af75962ba3ae518989d515c97436759
-Size (lldb-16.0.3.src.tar.xz) = 10378608 bytes
+BLAKE2s (cmake-16.0.4.src.tar.xz) = 5a7717df91090665eb73bd06a64a26013efe6f0750b09fbe6979505bae34754a
+SHA512 (cmake-16.0.4.src.tar.xz) = 942f10a5d1e3e48768d62a2595f8670872069ab2065871c786a435ae23108fb263e8c3db906dca0e68aeb8aad00f62f7604cd2f41da9e00f574b6021f846bb9d
+Size (cmake-16.0.4.src.tar.xz) = 9012 bytes
+BLAKE2s (lldb-16.0.4.src.tar.xz) = 1100a74d27c50c8d8146957c6da133208cfe9dd9c92a6ad1350628bb052309ee
+SHA512 (lldb-16.0.4.src.tar.xz) = f96084a587a12d3e979c67773951c73dfa797a2e53577ed1c74ecbe97ae62656228b190c07ccef9fe99c279356cb7ab4f84292d18b58be0978aa3f107ae764e9
+Size (lldb-16.0.4.src.tar.xz) = 10378640 bytes
 SHA1 (patch-cmake_modules_LLDBStandalone.cmake) = 773d420c3fd2c9b4af6af9d42c5778e96a1ae52b
 SHA1 (patch-source_API_CMakeLists.txt) = 23a7b24632f937a4541863aff6a7591255cafe40
 SHA1 (patch-source_Host_netbsd_HostNetBSD.cpp) = 8c19657d90ffea176b1297331fd23a8b565c6f1d
diff --git a/lldb/options.mk b/lldb/options.mk
index cae04cfdf6..fbc86431f4 100644
--- a/lldb/options.mk
+++ b/lldb/options.mk
@@ -19,33 +19,31 @@ CMAKE_ARGS+=	-DLLVM_INCLUDE_TESTS=OFF
 
 .  if ${OPSYS} == "NetBSD"
 .    if exists(/usr/include/panel.h)
-CMAKE_ARGS+=	-DLLDB_ENABLE_CURSES=1
-CMAKE_ARGS+=	-DLLVM_ENABLE_TERMINFO=1
+CMAKE_ARGS+=	-DLLDB_ENABLE_CURSES=ON
+CMAKE_ARGS+=	-DLLVM_ENABLE_TERMINFO=ON
 .    else
 .include "../../devel/ncurses/buildlink3.mk"
-.      if exists(${BUILDLINK_PREFIX.ncurses}/include/panel.h)
-CMAKE_ARGS+=    -DLLDB_ENABLE_CURSES=1
-CMAKE_ARGS+=	-DLLVM_ENABLE_TERMINFO=1
+.      if exists(${BUILDLINK_PREFIX.ncurses}/include/ncurses/panel.h)
+CMAKE_ARGS+=    -DLLDB_ENABLE_CURSES=ON
+CMAKE_ARGS+=	-DLLVM_ENABLE_TERMINFO=ON
 .      else
-CMAKE_ARGS+=    -DLLDB_ENABLE_CURSES=0
-CMAKE_ARGS+=	-DLLVM_ENABLE_TERMINFO=0
+CMAKE_ARGS+=    -DLLDB_ENABLE_CURSES=OFF
+CMAKE_ARGS+=	-DLLVM_ENABLE_TERMINFO=OFF
 .      endif
 .    endif
-.  endif
-
-.  if ${OPSYS} != "NetBSD"
+.  else
 .include "../../devel/ncurses/buildlink3.mk"
-.    if exists(${BUILDLINK_PREFIX.ncurses}/include/panel.h)
-CMAKE_ARGS+=    -DLLDB_ENABLE_CURSES=1
-CMAKE_ARGS+=	-DLLVM_ENABLE_TERMINFO=1
+.    if exists(${BUILDLINK_PREFIX.ncurses}/include/ncurses/panel.h)
+CMAKE_ARGS+=    -DLLDB_ENABLE_CURSES=ON
+CMAKE_ARGS+=	-DLLVM_ENABLE_TERMINFO=ON
 .    else
-CMAKE_ARGS+=    -DLLDB_ENABLE_CURSES=0
-CMAKE_ARGS+=	-DLLVM_ENABLE_TERMINFO=0
+CMAKE_ARGS+=    -DLLDB_ENABLE_CURSES=OFF
+CMAKE_ARGS+=	-DLLVM_ENABLE_TERMINFO=OFF
 .    endif
 .  endif
 
 .else
 
-CMAKE_ARGS+=	-DLLDB_ENABLE_CURSES=0
-CMAKE_ARGS+=	-DLLVM_ENABLE_TERMINFO=0
+CMAKE_ARGS+=	-DLLDB_ENABLE_CURSES=OFF
+CMAKE_ARGS+=	-DLLVM_ENABLE_TERMINFO=OFF
 .endif
diff --git a/llvm/distinfo b/llvm/distinfo
index 41ece85444..6ac848887a 100644
--- a/llvm/distinfo
+++ b/llvm/distinfo
@@ -1,11 +1,11 @@
 $NetBSD: distinfo,v 1.41 2023/03/05 17:26:09 he Exp $
 
-BLAKE2s (cmake-16.0.3.src.tar.xz) = e3399f12ca1772ddb70ac856c9a3a57bcd073511ccabb8fa0fbb136ab527bde6
-SHA512 (cmake-16.0.3.src.tar.xz) = 01dd624f5276910760f15062f1f3abf68c6ab66c02a4b683ee739663d3f67c47420d8ce47d79e47144edc6bfcc390ffe37bd01d787186607421e3be7288c8569
-Size (cmake-16.0.3.src.tar.xz) = 9004 bytes
-BLAKE2s (llvm-16.0.3.src.tar.xz) = 03bc74493dee06703e7b638b1b3fea1e83e214e6826ecb5367a2b8b8d5ea065d
-SHA512 (llvm-16.0.3.src.tar.xz) = d475d47f4d2341ef33a33a95018e5ed76e327bfef849b332d65ee87accad9b396e3e05ed04eaa668f94e71816523d95021fbd43e0c070bce6d092ca13678c2ba
-Size (llvm-16.0.3.src.tar.xz) = 56152600 bytes
+BLAKE2s (cmake-16.0.4.src.tar.xz) = 5a7717df91090665eb73bd06a64a26013efe6f0750b09fbe6979505bae34754a
+SHA512 (cmake-16.0.4.src.tar.xz) = 942f10a5d1e3e48768d62a2595f8670872069ab2065871c786a435ae23108fb263e8c3db906dca0e68aeb8aad00f62f7604cd2f41da9e00f574b6021f846bb9d
+Size (cmake-16.0.4.src.tar.xz) = 9012 bytes
+BLAKE2s (llvm-16.0.4.src.tar.xz) = 74e4edf910ded818a7470f36572d3f063a32a539f3331d3e9c71aaf22e8dc586
+SHA512 (llvm-16.0.4.src.tar.xz) = b88e4a5844e99da4389be49900dfafd1e64284aa5c7541974490c7dd3a688a2f8dd4c4fbd53e859d4b7862a822ea1d05bbbd863322b296cb779936148a90244e
+Size (llvm-16.0.4.src.tar.xz) = 56146220 bytes
 SHA1 (patch-CMakeLists.txt) = c53cef61bdaeaf5216b78330992357a632a2b0b2
 SHA1 (patch-cmake_config-ix.cmake) = f5cd0c949d35020d1051f95417e7944aa71a3d54
 SHA1 (patch-cmake_modules_AddLLVM.cmake) = 4e6668e0c3e13423ce3e19304f4ad60f66d41562
diff --git a/llvm/version.mk b/llvm/version.mk
index fbfd9bf3b5..2bb12c0a8b 100644
--- a/llvm/version.mk
+++ b/llvm/version.mk
@@ -12,7 +12,7 @@
 # used by lang/wasi-libcxx
 # used by parallel/openmp
 
-LLVM_VERSION=	16.0.3
+LLVM_VERSION=	16.0.4
 MASTER_SITES=	${MASTER_SITE_GITHUB:=llvm/}
 GITHUB_PROJECT=	llvm-project
 GITHUB_RELEASE=	llvmorg-${PKGVERSION_NOREV}
diff --git a/openmp/Makefile b/openmp/Makefile
index 1f6c6f08a4..446cf7ef9b 100644
--- a/openmp/Makefile
+++ b/openmp/Makefile
@@ -11,11 +11,7 @@ HOMEPAGE=	https://openmp.llvm.org/
 COMMENT=	Support for the OpenMP language
 LICENSE=	apache-2.0
 
-CONFIGURE_DIRS=		${WRKDIR}/build
-CMAKE_ARG_PATH=		${WRKSRC}
-
 USE_LANGUAGES=		c gnu++14
-USE_CMAKE=		yes
 USE_TOOLS+=		perl pkg-config
 GCC_REQD+=		4.8
 
@@ -25,8 +21,6 @@ CMAKE_ARGS+=	-DOPENMP_ENABLE_OMPT_TOOLS=OFF
 
 BUILDLINK_TRANSFORM.NetBSD+=	opt:-std=c++14:-std=gnu++14 # alloca
 
-post-extract:
-	${MKDIR} ${WRKDIR}/build
-
+.include "../../devel/cmake/build.mk"
 .include "../../wip/llvm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/openmp/distinfo b/openmp/distinfo
index b254e7d05f..8bea84cd03 100644
--- a/openmp/distinfo
+++ b/openmp/distinfo
@@ -1,9 +1,9 @@
 $NetBSD: distinfo,v 1.17 2023/01/12 19:32:54 adam Exp $
 
-BLAKE2s (cmake-16.0.3.src.tar.xz) = e3399f12ca1772ddb70ac856c9a3a57bcd073511ccabb8fa0fbb136ab527bde6
-SHA512 (cmake-16.0.3.src.tar.xz) = 01dd624f5276910760f15062f1f3abf68c6ab66c02a4b683ee739663d3f67c47420d8ce47d79e47144edc6bfcc390ffe37bd01d787186607421e3be7288c8569
-Size (cmake-16.0.3.src.tar.xz) = 9004 bytes
-BLAKE2s (openmp-16.0.3.src.tar.xz) = 7dd054a55095e73285ffd40f04960c200e4f84912cd5a7c44648eae19dee0112
-SHA512 (openmp-16.0.3.src.tar.xz) = a94e6b31b6a93570bf2b218f08b17187a37100122927be7d9c53efea2fead7dcb026f280daa293017743761e88284a61ec2eded5dddc9cdb584cb7177022c750
-Size (openmp-16.0.3.src.tar.xz) = 1278080 bytes
+BLAKE2s (cmake-16.0.4.src.tar.xz) = 5a7717df91090665eb73bd06a64a26013efe6f0750b09fbe6979505bae34754a
+SHA512 (cmake-16.0.4.src.tar.xz) = 942f10a5d1e3e48768d62a2595f8670872069ab2065871c786a435ae23108fb263e8c3db906dca0e68aeb8aad00f62f7604cd2f41da9e00f574b6021f846bb9d
+Size (cmake-16.0.4.src.tar.xz) = 9012 bytes
+BLAKE2s (openmp-16.0.4.src.tar.xz) = 75d28f99b53122bc46d86e76fc5c4bfbabe5f9d15d2d65ff789c7a37330fcff0
+SHA512 (openmp-16.0.4.src.tar.xz) = ebe58859b5ffe56960f0a0743e7b4144bbdd245ea915d8357ce1052af436768f90861472a83e097793d0963fa4fb412810d03538b9c73396eb9d4b4980ad5b3d
+Size (openmp-16.0.4.src.tar.xz) = 1278420 bytes
 SHA1 (patch-runtime_src_kmp__runtime.cpp) = 70f4396d4c1631fbd74692ef26b22d08675da547
diff --git a/polly/Makefile b/polly/Makefile
index 5d167c2436..de8ab7a809 100644
--- a/polly/Makefile
+++ b/polly/Makefile
@@ -13,19 +13,13 @@ LICENSE=	apache-2.0
 
 DEPENDS+=	llvm-${PKGVERSION_NOREV}{,nb*}:../../wip/llvm
 
-CONFIGURE_DIRS=		${WRKDIR}/build
-CMAKE_ARG_PATH=		${WRKSRC}
-
-USE_LANGUAGES=		c c++17
-USE_CMAKE=		yes
-GCC_REQD+=		4.8
+USE_LANGUAGES=	c c++17
+GCC_REQD+=	4.8
 
 CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=Release
 CMAKE_ARGS+=	-DCMAKE_C_COMPILER=${CC:Q}
 CMAKE_ARGS+=	-DCMAKE_CXX_COMPILER=${CXX:Q}
 
-post-extract:
-	${MKDIR} ${WRKDIR}/build
-
+.include "../../devel/cmake/build.mk"
 .include "../../wip/llvm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/polly/distinfo b/polly/distinfo
index b174926e4d..d68028ea06 100644
--- a/polly/distinfo
+++ b/polly/distinfo
@@ -1,9 +1,9 @@
 $NetBSD: distinfo,v 1.29 2023/01/12 19:32:53 adam Exp $
 
-BLAKE2s (cmake-16.0.3.src.tar.xz) = e3399f12ca1772ddb70ac856c9a3a57bcd073511ccabb8fa0fbb136ab527bde6
-SHA512 (cmake-16.0.3.src.tar.xz) = 01dd624f5276910760f15062f1f3abf68c6ab66c02a4b683ee739663d3f67c47420d8ce47d79e47144edc6bfcc390ffe37bd01d787186607421e3be7288c8569
-Size (cmake-16.0.3.src.tar.xz) = 9004 bytes
-BLAKE2s (polly-16.0.3.src.tar.xz) = 3d925cfa5a0972cff968cf3e3072094a867587df2479a74b4bcb606ef01174de
-SHA512 (polly-16.0.3.src.tar.xz) = 3a4c005ecf219d275eddd99459c89b9f021df90a1f84659ce0154a5e8798463ceabffe96bb7643c4eb01be39eaa3ce8538164d4c64b7cf94b8b2d488197bcdc8
-Size (polly-16.0.3.src.tar.xz) = 9364240 bytes
+BLAKE2s (cmake-16.0.4.src.tar.xz) = 5a7717df91090665eb73bd06a64a26013efe6f0750b09fbe6979505bae34754a
+SHA512 (cmake-16.0.4.src.tar.xz) = 942f10a5d1e3e48768d62a2595f8670872069ab2065871c786a435ae23108fb263e8c3db906dca0e68aeb8aad00f62f7604cd2f41da9e00f574b6021f846bb9d
+Size (cmake-16.0.4.src.tar.xz) = 9012 bytes
+BLAKE2s (polly-16.0.4.src.tar.xz) = d393f2fe9c3747d2b7cb802522988dd8b2134bb2da51ab2f3f84eedf8a81a468
+SHA512 (polly-16.0.4.src.tar.xz) = a755b6aa93d0498ce7d14cab13ef124afeb9895f7f8554be0d52765f83b586336c49887047824030d8b25e5fdf13389ab319f741c56fb8ebd7e658ba5db20e7a
+Size (polly-16.0.4.src.tar.xz) = 9362172 bytes
 SHA1 (patch-CMakeLists.txt) = 8138e11f858f23e0069c8fa0c07eff2b7aaf8c43
diff --git a/wasi-compiler-rt/Makefile b/wasi-compiler-rt/Makefile
index 2a765d08b6..8f0f906253 100644
--- a/wasi-compiler-rt/Makefile
+++ b/wasi-compiler-rt/Makefile
@@ -16,16 +16,12 @@ DISTINFO_FILE=	${.CURDIR}/../../wip/compiler-rt/distinfo
 
 NOT_FOR_PLATFORM=	NetBSD-[0-7].*-*
 
-USE_CMAKE=	yes
 USE_LANGUAGES=	c99 c++11
 USE_TOOLS+=	ggrep
 
 SSP_SUPPORTED=		no
 PKGSRC_USE_STACK_CHECK=	no
 
-CONFIGURE_DIRS=	build
-CMAKE_ARG_PATH=	${WRKSRC}/lib/builtins
-
 BUILDLINK_TRANSFORM+=	rm:-I/usr/include
 BUILDLINK_TRANSFORM+=	rm:-I${PREFIX}/include
 
@@ -58,9 +54,6 @@ CMAKE_INSTALL_PREFIX=	${PREFIX}/lib/clang/${LLVM_MAJOR_VERSION}
 GENERATE_PLIST+=	find ${DESTDIR}${PREFIX} \( -type f -o -type l \) -print | \
 			sed 's,${DESTDIR}${PREFIX}/,,' | ${SORT} ;
 
-post-extract:
-	${MKDIR} ${WRKSRC}/build
-
 .include "../../mk/bsd.prefs.mk"
 
 # Run llvm-ranlib again on the archive. Fixes mystery build failure
@@ -77,6 +70,7 @@ CFLAGS=			-O2
 CXXFLAGS=		-O2
 PKGSRC_COMPILER=	clang
 CLANGBASE=		${PREFIX}
+.include "../../devel/cmake/build.mk"
 BUILDLINK_DEPMETHOD.clang=	build
 .include "../../wip/clang/buildlink3.mk"
 .include "../../wip/llvm/buildlink3.mk"
diff --git a/wasi-libcxx/distinfo b/wasi-libcxx/distinfo
index 1e445d2155..d3620f2220 100644
--- a/wasi-libcxx/distinfo
+++ b/wasi-libcxx/distinfo
@@ -1,13 +1,13 @@
 $NetBSD: distinfo,v 1.8 2023/01/12 19:32:54 adam Exp $
 
-BLAKE2s (cmake-16.0.3.src.tar.xz) = e3399f12ca1772ddb70ac856c9a3a57bcd073511ccabb8fa0fbb136ab527bde6
-SHA512 (cmake-16.0.3.src.tar.xz) = 01dd624f5276910760f15062f1f3abf68c6ab66c02a4b683ee739663d3f67c47420d8ce47d79e47144edc6bfcc390ffe37bd01d787186607421e3be7288c8569
-Size (cmake-16.0.3.src.tar.xz) = 9004 bytes
-BLAKE2s (libcxx-16.0.3.src.tar.xz) = 13a8782c80c7b3c6602155bd55edc4953b206ea8999dfe237b0871ef7ec36357
-SHA512 (libcxx-16.0.3.src.tar.xz) = a72cf785e9b0cbbc9abe563fd4a42991b5bd9e9797246696f5ac06372af56d4f7ff4925aa086c9b726761db769a995004d147e7105d638f9908d0d0cf969aa79
-Size (libcxx-16.0.3.src.tar.xz) = 3655980 bytes
-BLAKE2s (libcxxabi-16.0.3.src.tar.xz) = 02c4ecfe5e3e62749d8ecb68b4713b6d57ca32f536c3869a7cbc7d438e6c2467
-SHA512 (libcxxabi-16.0.3.src.tar.xz) = 84947b4d9f4d32b619c78e35e84758b95ec1f16af31a817c84c17438d79f1ff6938fa5c30dd20e6a76ab43051d3e842d238366a780a135a35e8b980becc8869f
-Size (libcxxabi-16.0.3.src.tar.xz) = 573640 bytes
+BLAKE2s (cmake-16.0.4.src.tar.xz) = 5a7717df91090665eb73bd06a64a26013efe6f0750b09fbe6979505bae34754a
+SHA512 (cmake-16.0.4.src.tar.xz) = 942f10a5d1e3e48768d62a2595f8670872069ab2065871c786a435ae23108fb263e8c3db906dca0e68aeb8aad00f62f7604cd2f41da9e00f574b6021f846bb9d
+Size (cmake-16.0.4.src.tar.xz) = 9012 bytes
+BLAKE2s (libcxx-16.0.4.src.tar.xz) = f1068e578400f84cfa95da79c154762a086e36c3fe6f5bee58376c22e3b5f2a9
+SHA512 (libcxx-16.0.4.src.tar.xz) = 1db5be23edfa0d4ec41d310bb56e1a9b522840d4151adaa459475e8f2700b220b46c3e0ada7f58defd0e484066557d31351fd6cdba4661063ce6ac2aca5d41f2
+Size (libcxx-16.0.4.src.tar.xz) = 3644736 bytes
+BLAKE2s (libcxxabi-16.0.4.src.tar.xz) = cfa1424e3fbc7ea6384f131da4274bcc961188f6c1d326283a8cffdd0266d9e7
+SHA512 (libcxxabi-16.0.4.src.tar.xz) = 1788561d031c55772aacc9498975cc9843c36dde32e2821fe0c0188a6cf4f0ad14a5fb7d7d8cef1e314d04e582a5f716f2143bffbf95c1898a5106fd162c20c9
+Size (libcxxabi-16.0.4.src.tar.xz) = 573596 bytes
 SHA1 (patch-libcxx_include_CMakeLists.txt) = ca1d4f8dbc99bbcfdad6a0bd389f973a48a938d7
 SHA1 (patch-libcxxabi_src_CMakeLists.txt) = ccd70bb5902b31a6bb989521e9a5f50fe0a4021d
Home | Main Index | Thread Index | Old Index