From d69a2da4d29725ee37c6e9c140bcc0a6dbf8c873 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 10 Feb 2024 22:01:22 -0500
Subject: [PATCH] llvm17: drop compiler-rt, include in clang17

---
 srcpkgs/compiler-rt     |  1 -
 srcpkgs/llvm17/template | 27 ++++++---------------------
 2 files changed, 6 insertions(+), 22 deletions(-)
 delete mode 120000 srcpkgs/compiler-rt

diff --git a/srcpkgs/compiler-rt b/srcpkgs/compiler-rt
deleted file mode 120000
index 96970d5c02c13a..00000000000000
--- a/srcpkgs/compiler-rt
+++ /dev/null
@@ -1 +0,0 @@
-llvm17
\ No newline at end of file
diff --git a/srcpkgs/llvm17/template b/srcpkgs/llvm17/template
index aef0bf773d6be0..a882209425034e 100644
--- a/srcpkgs/llvm17/template
+++ b/srcpkgs/llvm17/template
@@ -1,7 +1,7 @@
 # Template file for 'llvm17'
 pkgname=llvm17
 version=17.0.6
-revision=2
+revision=3
 build_wrksrc=llvm
 build_style=cmake
 _ext_suffix=".cpython-${py3_ver/./}-linux-${XBPS_TARGET_LIBC/glibc/gnu}.so"
@@ -59,11 +59,10 @@ fi
 
 subpackages="libllvm17 llvm17-doc llvm17-devel"
 _enabled_projects=
-_enabled_runtimes=
 
 if [ "$build_option_clang" ]; then
 	_enabled_projects+="clang;"
-	subpackages+=" clang17 clang17-headers clang17-devel libclang17 libclang-cpp17 clang-analyzer17 "
+	subpackages+=" clang17-headers clang17 clang17-devel libclang17 libclang-cpp17 clang-analyzer17 "
 fi
 if [ "$build_option_clang_tools_extra" ]; then
 	_enabled_projects+="clang-tools-extra;"
@@ -96,6 +95,8 @@ if [ "$build_option_flang" ]; then
 	subpackages+=" flang17 flang17-devel "
 fi
 
+_enabled_runtimes="compiler-rt"
+
 # enable if runtime subpackages link to this version of llvm
 if true; then
 	subpackages+=" llvm-libunwind llvm-libunwind-devel "
@@ -104,9 +105,6 @@ if true; then
 	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
@@ -119,9 +117,9 @@ if true; then
 			;;
 	esac
 
-	configure_args+=" -DLLVM_ENABLE_RUNTIMES=${_enabled_runtimes}"
 fi
 
+configure_args+=" -DLLVM_ENABLE_RUNTIMES=${_enabled_runtimes}"
 configure_args+=" -DLLVM_ENABLE_PROJECTS=${_enabled_projects}"
 
 if [ "$CROSS_BUILD" ]; then
@@ -292,6 +290,7 @@ clang17_package() {
 	short_desc+=" - C language family frontend"
 	homepage="https://clang.llvm.org/"
 	pkg_install() {
+		vmove usr/lib/clang/17
 		vmove usr/bin/clang-17
 		vmove usr/bin/clang
 		vmove usr/bin/clang++
@@ -654,20 +653,6 @@ libcxx-devel_package() {
 	}
 }
 
-compiler-rt_package() {
-	short_desc+=" - runtime libraries"
-	homepage="https://compiler-rt.llvm.org/"
-	pkg_install() {
-		vmove usr/lib/clang/17/lib
-		if [ -d "${DESTDIR}/usr/lib/clang/17/bin" ]; then
-			vmove usr/lib/clang/17/bin
-		fi
-		if [ -d "${DESTDIR}/usr/lib/clang/17/share" ]; then
-			vmove usr/lib/clang/17/share
-		fi
-	}
-}
-
 libllvm17_package() {
 	short_desc+=" - library"
 	pkg_install() {