Re: [PR PATCH] [Updated] llvm17: fixup and refactor

[Calandracas606 <Calandracas606@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1311 bytes --]

There is an updated pull request by Calandracas606 against master on the void-packages repository

https://github.com/Calandracas606/void-packages llvm17-fixup
https://github.com/void-linux/void-packages/pull/48625

llvm17: fixup and refactor
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, x86_64-musl

Fixes an issue where clang17 fails to compile anything due to missing headers (stddef.h)

In the meantime, clang17-devel needs to be installed to use clang17

[ci skip]

closes #48616

A patch file from https://github.com/void-linux/void-packages/pull/48625.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-llvm17-fixup-48625.patch --]
[-- Type: text/x-diff, Size: 20912 bytes --]

From 9636d998faca2b99d269b72951c34fdc028f945d Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Feb 2024 11:37:07 -0500
Subject: [PATCH 1/6] llvm17: Fix issues and refactor

---
 srcpkgs/clang17-headers    |   1 +
 srcpkgs/compiler-rt        |   1 +
 srcpkgs/llvm17-cross-tools |   1 +
 srcpkgs/llvm17/template    | 180 +++++++++++++++++++++++--------------
 4 files changed, 116 insertions(+), 67 deletions(-)
 create mode 120000 srcpkgs/clang17-headers
 create mode 120000 srcpkgs/compiler-rt
 create mode 120000 srcpkgs/llvm17-cross-tools

diff --git a/srcpkgs/clang17-headers b/srcpkgs/clang17-headers
new file mode 120000
index 0000000000000..96970d5c02c13
--- /dev/null
+++ b/srcpkgs/clang17-headers
@@ -0,0 +1 @@
+llvm17
\ No newline at end of file
diff --git a/srcpkgs/compiler-rt b/srcpkgs/compiler-rt
new file mode 120000
index 0000000000000..96970d5c02c13
--- /dev/null
+++ b/srcpkgs/compiler-rt
@@ -0,0 +1 @@
+llvm17
\ No newline at end of file
diff --git a/srcpkgs/llvm17-cross-tools b/srcpkgs/llvm17-cross-tools
new file mode 120000
index 0000000000000..96970d5c02c13
--- /dev/null
+++ b/srcpkgs/llvm17-cross-tools
@@ -0,0 +1 @@
+llvm17
\ No newline at end of file
diff --git a/srcpkgs/llvm17/template b/srcpkgs/llvm17/template
index 7bc22ec50272e..70afbc90fd53b 100644
--- a/srcpkgs/llvm17/template
+++ b/srcpkgs/llvm17/template
@@ -1,7 +1,7 @@
 # Template file for 'llvm17'
 pkgname=llvm17
 version=17.0.6
-revision=1
+revision=2
 build_wrksrc=llvm
 build_style=cmake
 _ext_suffix=".cpython-${py3_ver/./}-linux-${XBPS_TARGET_LIBC/glibc/gnu}.so"
@@ -24,9 +24,9 @@ configure_args="
  -DLLVM_BUILD_LLVM_DYLIB=YES
  -DLLVM_LINK_LLVM_DYLIB=YES
  -DCLANG_LINK_CLANG_DYLIB=YES
+ -DCLANG_CONFIG_FILE_SYSTEM_DIR=/etc/clang17
  -DLLVM_ENABLE_RTTI=YES
  -DLLVM_ENABLE_FFI=YES
- -DLLVM_ENABLE_RUNTIMES=all
  -DLLVM_BINUTILS_INCDIR=/usr/include
  -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=NO
  -DLLDB_PYTHON_RELATIVE_PATH=lib/python${py3_ver}/site-packages
@@ -36,7 +36,6 @@ hostmakedepends="perl python3 zlib-devel libffi-devel swig python3-Sphinx
  python3-recommonmark python3-sphinx-automodapi git python3-sphinx-markdown-tables python3-yaml pkg-config "
 makedepends="python3-devel zlib-devel elfutils-devel libffi-devel libedit-devel
  libxml2-devel binutils-devel "
-depends="libllvm17>=${version}_${revision}"
 short_desc="LLVM Compiler Infrastructure Project - Version 17"
 maintainer="Daniel Martinez <danielmartinez@cock.li>"
 license="Apache-2.0"
@@ -46,25 +45,25 @@ checksum=58a8818c60e6627064f312dbf46c02d9949956558340938b71cf731ad8bc0813
 lib32disabled=yes
 python_version=3
 
-build_options="clang clang_tools_extra lld mlir libclc polly lldb flang bolt openmp"
+build_options="clang clang_tools_extra lld mlir libclc polly lldb flang bolt"
 build_options_default="clang clang_tools_extra lld mlir libclc polly lldb"
 
 case "$XBPS_TARGET_MACHINE" in
-	x86_64*|aarch64*) build_options_default+=" flang bolt openmp ";;
+	x86_64*|aarch64*) build_options_default+=" flang bolt ";;
 esac
 
-if [ "$XBPS_CCACHE" ]; then
-	configure_args+=" -DLLVM_CCACHE_BUILD=YES "
-fi
-
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	configure_args+=" -DLIBCXX_HAS_MUSL_LIBC=YES
 	 -DCOMPILER_RT_BUILD_GWP_ASAN=OFF"
 fi
 
+subpackages="libllvm17 llvm17-doc llvm17-devel"
+_enabled_projects=
+_enabled_runtimes=
+
 if [ "$build_option_clang" ]; then
 	_enabled_projects+="clang;"
-	subpackages+=" clang17 clang17-devel libclang17 libclang-cpp17 clang-analyzer17 "
+	subpackages+=" clang17 clang17-headers clang17-devel libclang17 libclang-cpp17 clang-analyzer17 "
 fi
 if [ "$build_option_clang_tools_extra" ]; then
 	_enabled_projects+="clang-tools-extra;"
@@ -96,15 +95,37 @@ if [ "$build_option_flang" ]; then
 	_enabled_projects+="flang;"
 	subpackages+=" flang17 flang17-devel "
 fi
-if [ "$build_option_openmp" ]; then
-	_enabled_projects+="openmp;"
-	subpackages+=" libomp libomp-devel "
+
+# enable if runtime subpackages link to this version of llvm
+if true; then
+	subpackages+=" llvm-libunwind llvm-libunwind-devel "
+	_enabled_runtimes+="${_enabled_runtimes:+;}libunwind"
+
+	subpackages+=" libcxx libcxx-devel libcxxabi libcxxabi-devel "
+	_enabled_runtimes+="${_enabled_runtimes:+;}libcxxabi;libcxx"
+
+	subpackages+=" compiler-rt "
+	_enabled_runtimes+="${_enabled_runtimes:+;}compiler-rt"
+
+	case "$XBPS_TARGET_MACHINE" in
+		x86_64*|aarch64*)
+			# openmp fails when built as runtime if cross-compiled
+			if [ "$CROSS_BUILD" ]; then
+				_enabled_projects+="openmp;"
+			else
+				_enabled_runtimes+="${_enabled_runtimes:+;}openmp"
+			fi
+			subpackages+=" libomp libomp-devel "
+			;;
+	esac
+
+	configure_args+=" -DLLVM_ENABLE_RUNTIMES=${_enabled_runtimes}"
 fi
-subpackages+=" llvm-libunwind llvm-libunwind-devel libcxx libcxx-devel libcxxabi libcxxabi-devel libllvm17 llvm17-doc llvm17-devel "
 
 configure_args+=" -DLLVM_ENABLE_PROJECTS=${_enabled_projects}"
 
 if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" llvm17-cross-tools"
 	# Seems to require a full host llvm/clang build
 	configure_args+=" -DLIBOMPTARGET_BUILD_CUDA_PLUGIN=OFF"
 	configure_args+=" -DLIBOMPTARGET_BUILD_AMDGPU_PLUGIN=OFF"
@@ -113,6 +134,7 @@ fi
 
 # For OCaml bindings and lldb lua scripting
 if [ -z "$CROSS_BUILD" ]; then
+	subpackages+=" llvm17-cross-tools"
 	# OCaml cross build is broken
 	hostmakedepends+=" ocaml ocaml-findlib "
 	# lldb cross build fails with lua
@@ -170,37 +192,16 @@ pre_configure() {
 	esac
 
 	if [ "$CROSS_BUILD" ]; then
-		msg_normal "Building host tblgen\n"
-		mkdir -p build/HOST
-		cd build/HOST
-		CC="$BUILD_CC" CXX="$BUILD_CXX" CFLAGS="$BUILD_CFLAGS" \
-			CXXFLAGS="$BUILD_CXXFLAGS" LDFLAGS="$BUILD_LDFLAGS" \
-			cmake ../.. -DCMAKE_BUILD_TYPE=Release \
-			-DLLVM_ENABLE_PROJECTS=${_enabled_projects}
-
-		make ${makejobs} -C utils/TableGen
-		configure_args+=" -DLLVM_TABLEGEN=${wrksrc}/llvm/build/HOST/bin/llvm-tblgen"
-
-		make ${makejobs} -C tools/clang/utils/TableGen
-		configure_args+=" -DCLANG_TABLEGEN=${wrksrc}/llvm/build/HOST/bin/clang-tblgen"
-
-		make ${makejobs} -C tools/mlir/tools/mlir-pdll
-		configure_args+=" -DMLIR_TABLEGEN=${wrksrc}/llvm/build/HOST/bin/mlir-tblgen"
-		configure_args+=" -DMLIR_PDLL_TABLEGEN=${wrksrc}/llvm/build/HOST/bin/mlir-pdll"
-		configure_args+=" -DMLIR_LINALG_ODS_YAML_GEN=${wrksrc}/llvm/build/HOST/bin/mlir-linalg-ods-yaml-gen"
-
-		make ${makejobs} -C tools/clang/tools/extra/clang-tidy/misc/ConfusableTable
-		configure_args+=" -DCLANG_TIDY_CONFUSABLE_CHARS_GEN=${wrksrc}/llvm/build/HOST/bin/clang-tidy-confusable-chars-gen"
-		make ${makejobs} -C tools/clang/tools/extra/pseudo/gen
-		configure_args+=" -DCLANG_PSEUDO_GEN=${wrksrc}/llvm/build/HOST/bin/clang-pseudo-gen"
-
-		make ${makejobs} -C tools/llvm-config
-		configure_args+=" -DLLVM_CONFIG_PATH=${wrksrc}/llvm/build/HOST/bin/llvm-config"
-
-		make ${makejobs} -C tools/lldb/utils/TableGen lldb-tblgen
-		configure_args+=" -DLLDB_TABLEGEN_EXE=${wrksrc}/llvm/build/HOST/bin/lldb-tblgen"
-
-		cd ../..
+		configure_args+=" -DLLVM_NATIVE_TOOL_DIR=/usr/bin"
+		configure_args+=" -DLLVM_TABLEGEN=/usr/bin/llvm-tblgen"
+		configure_args+=" -DCLANG_TABLEGEN=/usr/bin/clang-tblgen"
+		configure_args+=" -DMLIR_TABLEGEN=/usr/bin/mlir-tblgen"
+		configure_args+=" -DMLIR_PDLL_TABLEGEN=/usr/bin/mlir-pdll"
+		configure_args+=" -DMLIR_LINALG_ODS_YAML_GEN=/usr/bin/mlir-linalg-ods-yaml-gen"
+		configure_args+=" -DCLANG_TIDY_CONFUSABLE_CHARS_GEN=/usr/bin/clang-tidy-confusable-chars-gen"
+		configure_args+=" -DCLANG_PSEUDO_GEN=/usr/bin/clang-pseudo-gen"
+		configure_args+=" -DLLVM_CONFIG_PATH=/usr/bin/llvm-config"
+		configure_args+=" -DLLDB_TABLEGEN_EXE=/usr/bin/lldb-tblgen"
 	fi
 
 	case "$XBPS_TARGET_MACHINE" in
@@ -238,6 +239,14 @@ post_build() {
 		-DSPHINX_WARNINGS_AS_ERRORS=OFF
 
 	ninja ${makejobs} -C ${wrksrc}/${build_wrksrc}/runtimes-doc docs-libcxx-html docs-libunwind-html
+
+	if [ -z "$CROSS_BUILD" ]; then
+		# Binaries ONLY used during the process of building llvm, and aren't usually installed
+		vmkdir usr/bin
+		vcopy build/bin/lldb-tblgen usr/bin
+		vcopy build/bin/clang-tidy-confusable-chars-gen usr/bin
+		vcopy build/bin/clang-pseudo-gen usr/bin
+	fi
 }
 
 post_install() {
@@ -279,8 +288,7 @@ post_install() {
 
 clang17_package() {
 	lib32disabled=yes
-	depends="libstdc++-devel libgcc-devel  binutils ${XBPS_TARGET_LIBC}-devel
-	 libclang17-${version}_${revision} "
+	depends="libstdc++-devel libgcc-devel  binutils ${XBPS_TARGET_LIBC}-devel"
 	short_desc+=" - C language family frontend"
 	homepage="https://clang.llvm.org/"
 	pkg_install() {
@@ -313,16 +321,28 @@ clang17_package() {
 	}
 }
 
+clang17-headers_package() {
+	lib32disabled=yes
+	short_desc+=" - C language family frontend - Headers"
+	homepage="https://clang.llvm.org/"
+	pkg_install() {
+		vmove usr/lib/clang/17/include
+	}
+}
+
 clang17-devel_package() {
 	lib32disabled=yes
 	depends="libstdc++-devel libgcc-devel  binutils ${XBPS_TARGET_LIBC}-devel
-	 libclang17-${version}_${revision}"
+		clang17-${version}_${revision} clang-analyzer17-${version}_${revision}
+		llvm17-${version}_${revision}"
+	if [ "$build_option_clang_tools_extra" ]; then
+		depends+=" clang-tools-extra17-${version}_${revision}"
+	fi
 	short_desc+=" - C language family frontend - development Files"
 	homepage="https://clang.llvm.org/"
 	pkg_install() {
 		vmove usr/include/clang
 		vmove usr/include/clang-c
-		vmove usr/lib/clang
 		vmove usr/lib/libear
 		vmove usr/lib/cmake/clang
 		vmove "usr/lib/libclang*.a"
@@ -343,14 +363,16 @@ clang17-devel_package() {
 }
 
 libclang17_package() {
-	short_desc+=" - C frontend runtime library"
+	depends="clang17-headers-${version}_${revision}"
+	short_desc+=" - C frontend library"
 	pkg_install() {
 		vmove "usr/lib/libclang.so.*"
 	}
 }
 
 libclang-cpp17_package() {
-	short_desc+=" - C frontend runtime library (C++ interface)"
+	depends="clang17-headers-${version}_${revision}"
+	short_desc+=" - C frontend library (C++ interface)"
 	pkg_install() {
 		vmove "usr/lib/libclang-cpp.so.*"
 	}
@@ -408,7 +430,7 @@ llvm-bolt17_package() {
 	lib32disabled=yes
 	short_desc+=" - post-link optimizer"
 	homepage="https://github.com/llvm/llvm-project/tree/main/bolt"
-	depends="clang17>=${version}_${revision}"
+	depends="clang17-${version}_${revision}"
 	pkg_install() {
 		vmove usr/bin/llvm-bolt
 		vmove usr/bin/perf2bolt
@@ -444,7 +466,7 @@ lldb17_package() {
 
 lldb17-devel_package() {
 	lib32disabled=yes
-	depends="lldb17>=${version}_${revision}"
+	depends="lldb17-${version}_${revision}"
 	short_desc+=" - LLDB debugger - development files"
 	pkg_install() {
 		vmove usr/include/lldb
@@ -469,7 +491,7 @@ lld17-devel_package() {
 	lib32disabled=yes
 	short_desc+=" - linker - development files"
 	homepage="https://lld.llvm.org"
-	depends="lld17>=${version}_${revision}"
+	depends="lld17-${version}_${revision} llvm17-${version}_${revision}"
 	pkg_install() {
 		vmove usr/include/lld
 		vmove usr/lib/cmake/lld
@@ -491,6 +513,7 @@ mlir17-devel_package() {
 	lib32disabled=yes
 	short_desc+=" - multi-level IR compiler framework - development files"
 	homepage="https://mlir.llvm.org/"
+	depends="mlir17-${version}_${revision} llvm17-${version}_${revision}"
 	pkg_install() {
 		vmove usr/bin/mlir-cpu-runner
 		vmove usr/bin/mlir-linalg-ods-yaml-gen
@@ -516,7 +539,7 @@ flang17_package() {
 	lib32disabled=yes
 	short_desc+=" - Fortran language frontend"
 	homepage="https://flang.llvm.org/"
-	depends="mlir17>=${version}_${revision}"
+	depends="mlir17-${version}_${revision}"
 	pkg_install() {
 		vmove usr/bin/flang-new
 		vmove usr/bin/flang-to-external-fc
@@ -527,7 +550,7 @@ flang17-devel_package() {
 	lib32disabled=yes
 	short_desc+=" - Fortran language frontend - development files"
 	homepage="https://flang.llvm.org/"
-	depends="flang17>=${version}_${revision}"
+	depends="flang17-${version}_${revision} llvm17-${version}_${revision}"
 	pkg_install() {
 		vmove usr/bin/bbc
 		vmove usr/bin/f18-parse-demo
@@ -551,14 +574,13 @@ libomp_package() {
 
 libomp-devel_package() {
 	short_desc+=" - Clang OpenMP support library - development files"
-	depends="libomp>=${version}_${revision}"
+	depends="libomp-${version}_${revision} llvm17-${version}_${revision}"
 	pkg_install() {
 		vmove usr/bin/llvm-omp-device-info
 		vmove usr/bin/llvm-omp-kernel-replay
 		vmove "usr/lib/libarcher*.so"
 		vmove "usr/lib/libomp*.so"
 		vmove usr/lib/cmake/openmp
-		vmove usr/share/man/man1/llvmopenmp.1
 		if [ -z "$CROSS_BUILD" ]; then
 			vmove "usr/lib/libomptarget*.bc"
 			vmove "usr/lib/libarcher*.a"
@@ -576,7 +598,7 @@ llvm-libunwind_package() {
 
 llvm-libunwind-devel_package() {
 	short_desc+=" - libunwind - development files"
-	depends="llvm-libunwind>=${version}_${revision}"
+	depends="llvm-libunwind-${version}_${revision}"
 	conflicts="libunwind-devel>=0"
 	pkg_install() {
 		vmove usr/include/mach-o
@@ -599,7 +621,7 @@ libcxxabi_package() {
 
 libcxxabi-devel_package() {
 	short_desc+=" - low level support for libc++ - development files"
-	depends="libcxxabi>=${version}_${revision}"
+	depends="libcxxabi-${version}_${revision}"
 	pkg_install() {
 		vmove "usr/include/*cxxabi*"
 		vmove "usr/lib/libc++abi.so"
@@ -616,7 +638,7 @@ libcxx_package() {
 
 libcxx-devel_package() {
 	short_desc+=" - C++ standard library - development files"
-	depends="libcxx>=${version}_${revision}"
+	depends="libcxx-${version}_${revision}"
 	pkg_install() {
 		vmove usr/include/c++
 		vmove "usr/lib/libc++.so"
@@ -629,15 +651,29 @@ libcxx-devel_package() {
 	}
 }
 
+compiler-rt_package() {
+	short_desc+=" - runtime libraries"
+	homepage="https://compiler-rt.llvm.org/"
+	pkg_install() {
+		vmove usr/lib/clang/17/lib
+		case "$XBPS_TARGET_MACHINE" in
+			x86_64*|aarch64*)
+				vmove usr/lib/clang/17/bin
+				vmove usr/lib/clang/17/share
+			;;
+		esac
+	}
+}
+
 libllvm17_package() {
-	short_desc+=" - runtime library"
+	short_desc+=" - library"
 	pkg_install() {
 		vmove "usr/lib/libLLVM-*.so*"
 	}
 }
 
 llvm17-doc_package() {
-	short_desc+=" - documentation "
+	short_desc+=" - documentation"
 	pkg_install() {
 		vmove usr/share/doc
 	}
@@ -645,15 +681,15 @@ llvm17-doc_package() {
 
 llvm17-devel_package() {
 	short_desc+=" - development files"
-	depends="llvm17>=${version}_${revision}"
+	depends="llvm17-${version}_${revision}"
 	if [ "$build_option_openmp" ]; then
-		depends+=" libomp-devel>={$version}_${revision} "
+		depends+=" libomp-devel-${version}_${revision} "
 	fi
 	if [ "$build_option_mlir" ]; then
-		depends+=" mlir17-devel>={$version}_${revision} "
+		depends+=" mlir17-devel-${version}_${revision} "
 	fi
 	if [ "$build_option_clang" ]; then
-		depends+=" clang17-devel>={$version}_${revision} "
+		depends+=" clang17-devel-${version}_${revision} "
 	fi
 	pkg_install() {
 		vmove usr/lib/libLLVM.so
@@ -663,6 +699,16 @@ llvm17-devel_package() {
 		vmove usr/include/llvm-c
 		vmove "usr/lib/libLLVM*.a"
 		vmove usr/lib/cmake/llvm
+	}
+}
 
+# These binaries are ONLY used when building llvm, they aren't normally installed
+llvm17-cross-tools_package() {
+	short_desc+=" - build tools for cross compiling LLVM"
+	depends="lldb17-devel-${version}_${revision} llvm17-devel-${version}_${revision}"
+	pkg_install() {
+		vmove usr/bin/lldb-tblgen
+		vmove usr/bin/clang-tidy-confusable-chars-gen
+		vmove usr/bin/clang-pseudo-gen
 	}
 }

From 93edd1724b31f772db21524b2052c873ae02f723 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Feb 2024 11:38:42 -0500
Subject: [PATCH 2/6] libclc: Cleanup dependancy on llvm17

---
 srcpkgs/libclc/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/libclc/template b/srcpkgs/libclc/template
index fa0807f9ace69..714d6acbb404f 100644
--- a/srcpkgs/libclc/template
+++ b/srcpkgs/libclc/template
@@ -6,9 +6,8 @@ build_style=cmake
 # disable clspv (failing tests, we don't ship it)
 configure_args="-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release
  -DLIBCLC_TARGETS_TO_BUILD=amdgcn--;amdgcn--amdhsa;r600--;nvptx--;nvptx64--;nvptx--nvidiacl;nvptx64--nvidiacl;spirv-mesa3d-;spirv64-mesa3d-"
-hostmakedepends="clang17 llvm17-devel python3 libedit-devel libffi-devel
+hostmakedepends="llvm17-devel python3 libedit-devel libffi-devel
  ncurses-devel zlib-devel SPIRV-LLVM-Translator"
-makedepends="llvm17-devel"
 short_desc="Open implementation of the OpenCL C programming language"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause, MIT"

From 306c59f85346cc84a01c1bf32a77687187fc9c48 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Feb 2024 11:37:48 -0500
Subject: [PATCH 3/6] clazy: Cleanup dependancy on llvm17

---
 srcpkgs/clazy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/clazy/template b/srcpkgs/clazy/template
index fdab8dda0b89b..5d9cf7c7cb04a 100644
--- a/srcpkgs/clazy/template
+++ b/srcpkgs/clazy/template
@@ -4,8 +4,8 @@ version=1.11
 revision=3
 build_style=cmake
 build_helper=qemu
-hostmakedepends="llvm"
-makedepends="clang llvm17-devel clang-tools-extra"
+hostmakedepends="llvm17 perl"
+makedepends="llvm17-devel"
 depends="clang"
 short_desc="Qt oriented code checker based on clang framework"
 maintainer="John <me@johnnynator.dev>"

From 27a7e162f2727a3644882cbf4adf6d0f8ba5fb48 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Feb 2024 11:38:22 -0500
Subject: [PATCH 4/6] mesa: Cleanup dependancy on llvm17

---
 srcpkgs/mesa/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index f763b99e58098..8613d434f71b2 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,7 +1,7 @@
 # Template file for 'mesa'
 pkgname=mesa
 version=23.3.5
-revision=2
+revision=3
 build_style=meson
 _llvmver=17
 #Disable LTO flag should be present, see https://gitlab.freedesktop.org/mesa/mesa/-/issues/6911
@@ -9,7 +9,7 @@ configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
  -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri -Ddri3=enabled
  -Dlmsensors=enabled -Dplatforms=x11$(vopt_if wayland ,wayland)
  -Dllvm=enabled -Db_lto=false -Dcpp_std=gnu++17"
-hostmakedepends="gettext flex pkg-config python3-Mako glslang llvm${_llvmver}-devel
+hostmakedepends="gettext flex pkg-config python3-Mako glslang llvm${_llvmver}
  $(vopt_if wayland 'wayland-protocols wayland-devel')"
 makedepends="elfutils-devel expat-devel libXdamage-devel
  libXxf86vm-devel libdrm-devel libffi-devel libva-devel
@@ -188,7 +188,6 @@ post_configure() {
 	if [ "$CROSS_BUILD" ]; then
 		find -iname "*.ninja" -exec sed -i "{}" \
 			-e "/rustc/s; --sysroot ${XBPS_CROSS_BASE}/usr;;g" \
-			-e "s; /usr/lib/; ${XBPS_CROSS_BASE}/usr/lib/;g" \
 			\;
 	fi
 }

From a5e5bc8dcf878e7ad9fe87498592e74e64e53468 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Feb 2024 11:39:03 -0500
Subject: [PATCH 5/6] qt5: Cleanup dependancy on llvm17

---
 srcpkgs/qt5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 6855e526a100a..126069709d117 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -7,7 +7,7 @@ version=5.15.11+20231124
 # base repo: https://invent.kde.org/qt/qt/qt5
 revision=2
 build_style=meta
-hostmakedepends="cmake llvm17 clang17 clang17-devel flex perl glib-devel pkg-config
+hostmakedepends="cmake clang17 flex perl glib-devel pkg-config
  python3 re2c ruby which"
 makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
  eudev-libudev-devel ffmpeg-devel freetds-devel glib-devel gst-plugins-base1-devel

From 06b4bb39f0b756860d7b399c58aed895fde46fc9 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Feb 2024 11:39:25 -0500
Subject: [PATCH 6/6] qt6-tools: Cleanup dependancy on llvm17

---
 srcpkgs/qt6-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-tools/template b/srcpkgs/qt6-tools/template
index 358f58a282a76..986db5dffd239 100644
--- a/srcpkgs/qt6-tools/template
+++ b/srcpkgs/qt6-tools/template
@@ -7,10 +7,10 @@ configure_args="-DEXTERNAL_GUMBO=ON -DLITEHTML_UTF8=ON -DUSE_ICU=ON
  -DQT_BUILD_SHARED_LIBS=ON -DQT_FEATURE_assistant=ON
  -DQT_FEATURE_pixeltool=ON
  -DQT_FEATURE_distancefieldgenerator=ON"
-hostmakedepends="qt6-base perl qt6-plugin-sqlite clang clang-tools-extra
+hostmakedepends="qt6-base perl qt6-plugin-sqlite clang17 clang-tools-extra17
  qt6-declarative-host-tools"
 makedepends="qt6-base-devel qt6-plugin-sqlite qt6-declarative-devel
- gumbo-parser-devel icu-devel llvm17-devel clang-tools-extra"
+ gumbo-parser-devel icu-devel llvm17-devel"
 short_desc="Cross-platform application and UI framework (QT6) - qt6-tools component"
 maintainer="John <me@johnnynator.dev>"
 license="custom:GPL-3.0-only-with-Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"