llvm21: update to 21.1.7.

Author: Duncaen

srcpkgs/llvm21/template

@@ -1,7 +1,7 @@
 # Template file for 'llvm21'
 pkgname=llvm21
-version=21.1.4
-revision=2
+version=21.1.7
+revision=1
 build_wrksrc=llvm
 build_style=cmake
 _major="${version%%.*}"
@@ -58,7 +58,7 @@ maintainer="Daniel Martinez <[email protected]>"
 license="Apache-2.0 AND NCSA AND custom:Apache-2.0-with-llvm-exception"
 homepage="https://www.llvm.org"
 distfiles="https://github.com/llvm/llvm-project/archive/refs/tags/llvmorg-${version}.tar.gz"
-checksum=3a0921d78be74302cb054da1dad59e706814d8fed3a6ac9b532e935825a0715c
+checksum=9ee167cdf8f6b5221d6b02dbe9a664cf8c6fee70fab071aaa4a3889c7c265258
 conflicts="llvm18>=0 llvm17>=0 llvm15>=0"
 lib32disabled=yes
 python_version=3
@@ -193,8 +193,8 @@ if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DLIBOMP_OMPD_GDB_SUPPORT=NO"
 
 	if [ "$build_option_flang" ]; then
-		configure_args+=" -DLIBOMP_FORTRAN_MODULES_COMPILER=/${_llvm_bindir}/flang-new"
-		configure_args+=" -DCMAKE_Fortran_COMPILER=/${_llvm_bindir}/flang-new"
+		configure_args+=" -DLIBOMP_FORTRAN_MODULES_COMPILER=/${_llvm_bindir}/flang"
+		configure_args+=" -DCMAKE_Fortran_COMPILER=/${_llvm_bindir}/flang"
 	fi
 else
 	# Needs lld on the target machine
@@ -570,7 +570,6 @@ clang21_package() {
 	short_desc+=" - C language family frontend"
 	homepage="https://clang.llvm.org/"
 	_clang_files=(
-		"bin/clang-${_major}"
 		bin/clang
 		bin/clang++
 		bin/clang-cl
@@ -597,6 +596,7 @@ clang21_package() {
 		share/man/man1/clang-tblgen.1
 	)
 
+	alternatives=""
 	for _alt in "${_clang_files[@]}"; do
 		alternatives+=" clang:/usr/${_alt}:/usr/${_llvm_prefix}/${_alt}"
 	done
@@ -608,7 +608,15 @@ clang21_package() {
 		"
 	fi
 	pkg_install() {
-		vlicense ${wrksrc}/clang/LICENSE.TXT
+		vlicense "${wrksrc}/clang/LICENSE.TXT"
+
+		vmove "usr/${_llvm_prefix}/bin/clang-${_major}"
+
+		vmkdir usr/bin
+		for _bin in clang clang++ clang-cpp clang-cl clang-scan-deps; do
+			ln -rs "${PKGDESTDIR}/usr/${_llvm_prefix}/bin/${_bin}" "${PKGDESTDIR}/usr/bin/${_bin}-${_major}"
+		done
+
 		for _bin in "${_clang_files[@]}"; do
 			vmove usr/${_llvm_prefix}/${_bin}
 		done
@@ -706,6 +714,7 @@ clang-analyzer21_package() {
 		bin/scan-build-py
 		bin/scan-view
 	)
+	alternatives=""
 	for _alt in "${_clang_analyzer_files[@]}"; do
 		alternatives+=" clang-analyzer:/usr/${_alt}:/usr/${_llvm_prefix}/${_alt}"
 	done
@@ -740,6 +749,7 @@ clang-tools-extra21_package() {
 		share/man/man1/extraclangtools.1
 	)
 
+	alternatives=""
 	for _alt in "${_clang_tools_extra_files[@]}"; do
 		alternatives+=" clang-tools-extra:/usr/${_alt}:/usr/${_llvm_prefix}/${_alt}"
 	done
@@ -765,6 +775,7 @@ llvm-bolt21_package() {
 		bin/merge-fdata
 		bin/llvm-bolt-heatmap
 	)
+	alternatives=""
 	for _alt in "${_llvm_bolt_files[@]}"; do
 		alternatives+=" llvm-bolt:/usr/${_alt}:/usr/${_llvm_prefix}/${_alt}"
 	done
@@ -797,6 +808,7 @@ lldb21_package() {
 	if [ -z "$CROSS_BUILD" ]; then
 		_lldb_files+=("lib/lua/5.3/lldb.so")
 	fi
+	alternatives=""
 	for _alt in "${_lldb_files[@]}"; do
 		alternatives+=" lldb:/usr/${_alt}:/usr/${_llvm_prefix}/${_alt}"
 	done
@@ -839,11 +851,18 @@ lld21_package() {
 		bin/ld64.lld
 		bin/wasm-ld
 	)
+	alternatives=""
 	for _alt in "${_lld_files[@]}"; do
 		alternatives+=" lld:/usr/${_alt}:/usr/${_llvm_prefix}/${_alt}"
 	done
 	pkg_install() {
 		vlicense ${wrksrc}/lld/LICENSE.TXT
+
+		vmkdir usr/bin
+		for _bin in ld.lld ld64.lld lld lld-link wasm-ld; do
+			ln -rs "${PKGDESTDIR}/usr/${_llvm_prefix}/bin/${_bin}" "${PKGDESTDIR}/usr/bin/${_bin}-${_major}"
+		done
+
 		for _f in "${_lld_files[@]}"; do
 			vmove usr/${_llvm_prefix}/${_f}
 		done
@@ -885,6 +904,7 @@ mlir21_package() {
 		bin/tblgen-lsp-server
 		share/man/man1/mlir-tblgen.1
 	)
+	alternatives=""
 	for _alt in "${_mlir_files[@]}"; do
 		alternatives+=" mlir:/usr/${_alt}:/usr/${_llvm_prefix}/${_alt}"
 	done
@@ -920,16 +940,25 @@ flang21_package() {
 	short_desc+=" - Fortran language frontend"
 	homepage="https://flang.llvm.org/"
 	_flang_files=(
+		bin/flang
 		bin/flang-new
 		bin/bbc
 		bin/f18-parse-demo
 		bin/fir-opt
 		bin/tco
 	)
+	alternatives=""
 	for _alt in "${_flang_files[@]}"; do
 		alternatives+=" flang:/usr/${_alt}:/usr/${_llvm_prefix}/${_alt}"
 	done
 	pkg_install() {
+		vmove "usr/${_llvm_prefix}/bin/flang-${_major}"
+
+		vmkdir usr/bin
+		for _bin in flang bbc tco fir-opt f18-parse-demo; do
+			ln -rs "${PKGDESTDIR}/usr/${_llvm_prefix}/bin/${_bin}" "${PKGDESTDIR}/usr/bin/${_bin}-${_major}"
+		done
+
 		for _f in "${_flang_files[@]}"; do
 			vmove usr/${_llvm_prefix}/${_f}
 		done
@@ -970,6 +999,7 @@ libomp21_package() {
 		_libomp_files+=("bin/llvm-omp-kernel-replay")
 		_libomp_files+=("lib/libomptarget.so")
 	fi
+	alternatives=""
 	for _alt in "${_libomp_files[@]}"; do
 		alternatives+=" libomp:/usr/${_alt}:/usr/${_llvm_prefix}/${_alt}"
 	done
@@ -1157,6 +1187,7 @@ libclc21_package() {
 		share/clc
 		share/pkgconfig/libclc.pc
 	)
+	alternatives=""
 	for _alt in "${_libclc_files[@]}"; do
 		alternatives+=" libclc:/usr/${_alt}:/usr/${_llvm_prefix}/${_alt}"
 	done