From 1088eba15b1921472270aff3666b800c42df2b5d Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 15 Mar 2021 23:26:05 +0100
Subject: [PATCH] cross*: drop the cross_triplet and _triplet variables

---
 Manual.md                                     |   6 +-
 common/build-style/void-cross.sh              | 119 +++++++++---------
 srcpkgs/cross-aarch64-linux-gnu/template      |   8 +-
 srcpkgs/cross-aarch64-linux-musl/template     |   8 +-
 srcpkgs/cross-arm-linux-gnueabi/template      |   8 +-
 srcpkgs/cross-arm-linux-gnueabihf/template    |   8 +-
 srcpkgs/cross-arm-linux-musleabi/template     |   8 +-
 srcpkgs/cross-arm-linux-musleabihf/template   |   8 +-
 srcpkgs/cross-armv7l-linux-gnueabihf/template |   8 +-
 .../cross-armv7l-linux-musleabihf/template    |   8 +-
 srcpkgs/cross-i686-linux-musl/template        |   8 +-
 srcpkgs/cross-i686-pc-linux-gnu/template      |   8 +-
 srcpkgs/cross-mips-linux-musl/template        |   8 +-
 srcpkgs/cross-mips-linux-muslhf/template      |   8 +-
 srcpkgs/cross-mipsel-linux-musl/template      |   8 +-
 srcpkgs/cross-mipsel-linux-muslhf/template    |   8 +-
 srcpkgs/cross-powerpc-linux-gnu/template      |   8 +-
 srcpkgs/cross-powerpc-linux-musl/template     |   8 +-
 srcpkgs/cross-powerpc64-linux-gnu/template    |   8 +-
 srcpkgs/cross-powerpc64-linux-musl/template   |   8 +-
 srcpkgs/cross-powerpc64le-linux-gnu/template  |   8 +-
 srcpkgs/cross-powerpc64le-linux-musl/template |   8 +-
 srcpkgs/cross-powerpcle-linux-gnu/template    |   8 +-
 srcpkgs/cross-powerpcle-linux-musl/template   |   8 +-
 srcpkgs/cross-x86_64-linux-gnu/template       |   8 +-
 srcpkgs/cross-x86_64-linux-musl/template      |   8 +-
 26 files changed, 135 insertions(+), 182 deletions(-)

diff --git a/Manual.md b/Manual.md
index ab86fc39696..4439865e1d7 100644
--- a/Manual.md
+++ b/Manual.md
@@ -976,9 +976,9 @@ via `make_install_target`.
 via `configure_args`, the meson command can be overridden by `meson_cmd` and the location of
 the out of source build by `meson_builddir`
 
-- `void-cross` For cross-toolchain packages used to build Void systems. You will need to
-specify `cross_triplet` (corresponds to the target triplet specified in the cross profile
-for the target arch). Optionally, `cross_gcc_skip_go` can be specified. Individual subproject
+- `void-cross` For cross-toolchain packages used to build Void systems. There are no
+mandatory variables (target triplet is inferred), but you can specify some optional
+ones - `cross_gcc_skip_go` can be specified to skip `gccgo`, individual subproject
 configure arguments can be specified via `cross_*_configure_args` where `*` is `binutils`,
 `gcc_bootstrap` (early gcc), `gcc` (final gcc), `glibc` (or `musl`), `configure_args` is
 additionally passed to both early and final `gcc`. You can also specify custom `CFLAGS`
diff --git a/common/build-style/void-cross.sh b/common/build-style/void-cross.sh
index 055b3dc3ce7..00fa1985c94 100644
--- a/common/build-style/void-cross.sh
+++ b/common/build-style/void-cross.sh
@@ -1,10 +1,6 @@
 #
 # This helper is for void system crosstoolchain templates.
 #
-# Mandatory variables:
-#
-# - cross_triplet - the target triplet (e.g. aarch64-linux-gnu)
-#
 # Optional variables:
 #
 # - cross_gcc_skip_go - do not build gccgo support
@@ -34,9 +30,10 @@ _void_cross_apply_patch() {
 _void_cross_build_binutils() {
 	[ -f ${wrksrc}/.binutils_done ] && return 0
 
-	local ver=$1
+	local tgt=$1
+	local ver=$2
 
-	msg_normal "Patching binutils for ${cross_triplet}\n"
+	msg_normal "Patching binutils for ${tgt}\n"
 
 	cd ${wrksrc}/binutils-${ver}
 	if [ -d "${XBPS_SRCPKGDIR}/binutils/patches" ]; then
@@ -46,7 +43,7 @@ _void_cross_build_binutils() {
 	fi
 	cd ..
 
-	msg_normal "Building binutils for ${cross_triplet}\n"
+	msg_normal "Building binutils for ${tgt}\n"
 
 	mkdir -p ${wrksrc}/binutils_build
 	cd ${wrksrc}/binutils_build
@@ -56,8 +53,8 @@ _void_cross_build_binutils() {
 		--sbindir=/usr/bin \
 		--libdir=/usr/lib \
 		--libexecdir=/usr/lib \
-		--target=${cross_triplet} \
-		--with-sysroot=/usr/${cross_triplet} \
+		--target=${tgt} \
+		--with-sysroot=/usr/${tgt} \
 		--disable-nls \
 		--disable-shared \
 		--disable-multilib \
@@ -84,9 +81,10 @@ _void_cross_build_binutils() {
 _void_cross_build_bootstrap_gcc() {
 	[ -f ${wrksrc}/.gcc_bootstrap_done ] && return 0
 
-	local ver=$1
+	local tgt=$1
+	local ver=$2
 
-	msg_normal "Patching GCC for ${cross_triplet}\n"
+	msg_normal "Patching GCC for ${tgt}\n"
 
 	cd ${wrksrc}/gcc-${ver}
 
@@ -103,7 +101,7 @@ _void_cross_build_bootstrap_gcc() {
 	fi
 	cd ..
 
-	msg_normal "Building bootstrap GCC for ${cross_triplet}\n"
+	msg_normal "Building bootstrap GCC for ${tgt}\n"
 
 	mkdir -p gcc_bootstrap
 	cd gcc_bootstrap
@@ -122,7 +120,7 @@ _void_cross_build_bootstrap_gcc() {
 		--sbindir=/usr/bin \
 		--libdir=/usr/lib \
 		--libexecdir=/usr/lib \
-		--target=${cross_triplet} \
+		--target=${tgt} \
 		--disable-nls \
 		--disable-multilib \
 		--disable-shared \
@@ -146,7 +144,7 @@ _void_cross_build_bootstrap_gcc() {
 	make ${makejobs}
 	make install DESTDIR=${wrksrc}/build_root
 
-	local ptrs=$(${cross_triplet}-gcc -dM -E - < /dev/null | \
+	local ptrs=$(${tgt}-gcc -dM -E - < /dev/null | \
 		grep __SIZEOF_POINTER__)
 	local ws=${ptrs##* }
 
@@ -162,10 +160,11 @@ _void_cross_build_bootstrap_gcc() {
 _void_cross_build_kernel_headers() {
 	[ -f ${wrksrc}/.linux_headers_done ] && return 0
 
-	local ver=$1
+	local tgt=$1
+	local ver=$2
 	local arch
 
-	msg_normal "Patching Linux headers for ${cross_triplet}\n"
+	msg_normal "Patching Linux headers for ${tgt}\n"
 
 	cd ${wrksrc}/linux-${ver}
 	for f in ${XBPS_SRCPKGDIR}/kernel-libc-headers/patches/*.patch; do
@@ -173,11 +172,11 @@ _void_cross_build_kernel_headers() {
 	done
 	cd ..
 
-	msg_normal "Building Linux headers for ${cross_triplet}\n"
+	msg_normal "Building Linux headers for ${tgt}\n"
 
 	cd linux-${ver}
 
-	case "$cross_triplet" in
+	case "$tgt" in
 		x86_64*|i686*) arch=x86 ;;
 		powerpc*) arch=powerpc ;;
 		mips*) arch=mips ;;
@@ -185,14 +184,14 @@ _void_cross_build_kernel_headers() {
 		arm*) arch=arm ;;
 		riscv*) arch=riscv ;;
 		s390*) arch=s390 ;;
-		*) msg_error "Unknown Linux arch for ${cross_triplet}\n" ;;
+		*) msg_error "Unknown Linux arch for ${tgt}\n" ;;
 	esac
 
 	make ARCH=${arch} headers
 	find usr/include -name '.*' -delete
 	rm usr/include/Makefile
 	rm -r usr/include/drm
-	cp -a usr/include ${wrksrc}/build_root/usr/${cross_triplet}/usr
+	cp -a usr/include ${wrksrc}/build_root/usr/${tgt}/usr
 
 	touch ${wrksrc}/.linux_headers_done
 }
@@ -200,10 +199,10 @@ _void_cross_build_kernel_headers() {
 _void_cross_build_glibc_headers() {
 	[ -f ${wrksrc}/.glibc_headers_done ] && return 0
 
-	local ver=$1
-	local tgt=$cross_triplet
+	local tgt=$1
+	local ver=$2
 
-	msg_normal "Patching glibc for ${cross_triplet}\n"
+	msg_normal "Patching glibc for ${tgt}\n"
 
 	cd ${wrksrc}/glibc-${ver}
 	if [ -d "${XBPS_SRCPKGDIR}/glibc/patches" ]; then
@@ -213,7 +212,7 @@ _void_cross_build_glibc_headers() {
 	fi
 	cd ..
 
-	msg_normal "Building glibc headers for ${cross_triplet}\n"
+	msg_normal "Building glibc headers for ${tgt}\n"
 
 	mkdir -p glibc_headers
 	cd glibc_headers
@@ -242,8 +241,8 @@ _void_cross_build_glibc_headers() {
 _void_cross_build_glibc() {
 	[ -f ${wrksrc}/.glibc_build_done ] && return 0
 
-	local ver=$1
-	local tgt=$cross_triplet
+	local tgt=$1
+	local ver=$2
 
 	msg_normal "Building glibc for ${tgt}\n"
 
@@ -284,8 +283,8 @@ _void_cross_build_glibc() {
 _void_cross_build_musl() {
 	[ -f ${wrksrc}/.musl_build_done ] && return 0
 
-	local ver=$1
-	local tgt=$cross_triplet
+	local tgt=$1
+	local ver=$2
 
 	msg_normal "Patching musl for ${tgt}\n"
 
@@ -321,12 +320,13 @@ _void_cross_build_libucontext() {
 	[ -n "$cross_gcc_skip_go" ] && return 0
 	[ -f ${wrksrc}/.libucontext_build_done ] && return 0
 
-	local ver=$1
+	local tgt=$1
+	local ver=$2
 	local arch incpath
 
-	msg_normal "Building libucontext for ${cross_triplet}\n"
+	msg_normal "Building libucontext for ${tgt}\n"
 
-	case "$cross_triplet" in
+	case "$tgt" in
 		x86_64*) arch=x86_64 ;;
 		i686*) arch=x86 ;;
 		powerpc64*) arch=ppc64 ;;
@@ -337,7 +337,7 @@ _void_cross_build_libucontext() {
 		arm*) arch=arm ;;
 		riscv64*) arch=riscv64 ;;
 		s390x*) arch=s390x ;;
-		*) msg_error "Unknown libucontext arch for ${cross_triplet}\n" ;;
+		*) msg_error "Unknown libucontext arch for ${tgt}\n" ;;
 	esac
 
 	cd ${wrksrc}/libucontext-${ver}
@@ -345,12 +345,12 @@ _void_cross_build_libucontext() {
 	# we build a static-only library to prevent linking to a runtime
 	# since it's tiny it can be linked into libgo and we don't have
 	# to keep it around (which would possibly conflict with crossdeps)
-	incpath="${wrksrc}/build_root/usr/${cross_triplet}/usr/include"
-	CC="${cross_triplet}-gcc" AS="${cross_triplet}-as" AR="${cross_triplet}-ar" \
+	incpath="${wrksrc}/build_root/usr/${tgt}/usr/include"
+	CC="${tgt}-gcc" AS="${tgt}-as" AR="${tgt}-ar" \
 	make ARCH=$arch libucontext.a \
 		CFLAGS="${cross_musl_cflags} -g0 -nostdinc -isystem ${incpath}"
 
-	cp libucontext.a ${wrksrc}/build_root/usr/${cross_triplet}/usr/lib
+	cp libucontext.a ${wrksrc}/build_root/usr/${tgt}/usr/lib
 
 	touch ${wrksrc}/.libucontext_build_done
 }
@@ -358,9 +358,10 @@ _void_cross_build_libucontext() {
 _void_cross_build_gcc() {
 	[ -f ${wrksrc}/.gcc_build_done ] && return 0
 
-	local ver=$1
+	local tgt=$1
+	local ver=$2
 
-	msg_normal "Building gcc for ${cross_triplet}\n"
+	msg_normal "Building gcc for ${tgt}\n"
 
 	mkdir -p ${wrksrc}/gcc_build
 	cd ${wrksrc}/gcc_build
@@ -396,9 +397,9 @@ _void_cross_build_gcc() {
 		--sbindir=/usr/bin \
 		--libdir=/usr/lib \
 		--libexecdir=/usr/lib \
-		--target=${cross_triplet} \
-		--with-sysroot=/usr/${cross_triplet} \
-		--with-build-sysroot=${wrksrc}/build_root/usr/${cross_triplet} \
+		--target=${tgt} \
+		--with-sysroot=/usr/${tgt} \
+		--with-build-sysroot=${wrksrc}/build_root/usr/${tgt} \
 		--enable-languages=${langs} \
 		--disable-nls \
 		--disable-multilib \
@@ -455,6 +456,7 @@ do_build() {
 	cd ${wrksrc}
 
 	local binutils_ver linux_ver gcc_ver libc_ver libucontext_ver
+	local tgt=${sourcepkg/cross-}
 
 	_void_cross_test_ver binutils
 	_void_cross_test_ver linux
@@ -476,16 +478,14 @@ do_build() {
 		fi
 	fi
 
-	[ "${cross_triplet}" ] || msg_error "cross_triplet not defined in template\n"
-
-	local sysroot="/usr/${cross_triplet}"
+	local sysroot="/usr/${tgt}"
 
 	# Prepare environment
 	cd ${wrksrc}
 
 	# Core directories for the build root
 	mkdir -p build_root/usr/{bin,lib,include,share}
-	mkdir -p build_root/usr/${cross_triplet}/usr/{bin,lib,include,share}
+	mkdir -p build_root/usr/${tgt}/usr/{bin,lib,include,share}
 
 	# Host root uses host wordsize
 	ln -sf usr/lib build_root/lib
@@ -496,7 +496,7 @@ do_build() {
 	ln -sf usr/lib build_root/${sysroot}/lib
 	ln -sf lib build_root/${sysroot}/usr/libexec
 
-	_void_cross_build_binutils ${binutils_ver}
+	_void_cross_build_binutils ${tgt} ${binutils_ver}
 
 	# Prepare environment so we can use temporary prefix
 	local oldpath="$PATH"
@@ -505,8 +505,8 @@ do_build() {
 	export PATH="${wrksrc}/build_root/usr/bin:$PATH"
 	export LD_LIBRARY_PATH="${wrksrc}/build_root/usr/lib:$PATH"
 
-	_void_cross_build_bootstrap_gcc ${gcc_ver}
-	_void_cross_build_kernel_headers ${linux_ver}
+	_void_cross_build_bootstrap_gcc ${tgt} ${gcc_ver}
+	_void_cross_build_kernel_headers ${tgt} ${linux_ver}
 
 	local ws=$(cat ${wrksrc}/.gcc_wordsize)
 
@@ -515,14 +515,14 @@ do_build() {
 	ln -sf lib ${wrksrc}/build_root/${sysroot}/usr/lib${ws}
 
 	if [ -f ${wrksrc}/.musl_version ]; then
-		_void_cross_build_musl ${libc_ver}
-		_void_cross_build_libucontext ${libucontext_ver}
+		_void_cross_build_musl ${tgt} ${libc_ver}
+		_void_cross_build_libucontext ${tgt} ${libucontext_ver}
 	else
-		_void_cross_build_glibc_headers ${libc_ver}
-		_void_cross_build_glibc ${libc_ver}
+		_void_cross_build_glibc_headers ${tgt} ${libc_ver}
+		_void_cross_build_glibc ${tgt} ${libc_ver}
 	fi
 
-	_void_cross_build_gcc ${gcc_ver}
+	_void_cross_build_gcc ${tgt} ${gcc_ver}
 
 	# restore this stuff in case later hooks depend on it
 	export PATH="$oldpath"
@@ -536,7 +536,8 @@ do_install() {
 	export PATH="${wrksrc}/build_root/usr/bin:$PATH"
 	export LD_LIBRARY_PATH="${wrksrc}/build_root/usr/lib:$PATH"
 
-	local sysroot="/usr/${cross_triplet}"
+	local tgt=${sourcepkg/cross-}
+	local sysroot="/usr/${tgt}"
 	local ws=$(cat ${wrksrc}/.gcc_wordsize)
 
 	# Core directories for the sysroot
@@ -578,7 +579,7 @@ do_install() {
 		make DESTDIR=${DESTDIR}/${sysroot} install
 
 		# Remove useless headers
-		rm -rf ${DESTDIR}/usr/lib/gcc/${cross_triplet}/*/include-fixed
+		rm -rf ${DESTDIR}/usr/lib/gcc/${tgt}/*/include-fixed
 
 		# Make ld-musl.so symlinks relative
 		for f in ${DESTDIR}/${sysroot}/usr/lib/ld-musl-*.so.*; do
@@ -590,14 +591,14 @@ do_install() {
 		make install_root=${DESTDIR}/${sysroot} install install-headers
 
 		# Remove bad header
-		rm -f ${DESTDIR}/usr/lib/gcc/${cross_triplet}/${gcc_patch}/include-fixed/bits/statx.h
+		rm -f ${DESTDIR}/usr/lib/gcc/${tgt}/${gcc_patch}/include-fixed/bits/statx.h
 	fi
 
 	# minor-versioned symlinks
-	mv ${DESTDIR}/usr/lib/gcc/${cross_triplet}/${gcc_patch} \
-		${DESTDIR}/usr/lib/gcc/${cross_triplet}/${gcc_minor}
-	ln -sfr ${DESTDIR}/usr/lib/gcc/${cross_triplet}/${gcc_minor} \
-		${DESTDIR}/usr/lib/gcc/${cross_triplet}/${gcc_patch}
+	mv ${DESTDIR}/usr/lib/gcc/${tgt}/${gcc_patch} \
+		${DESTDIR}/usr/lib/gcc/${tgt}/${gcc_minor}
+	ln -sfr ${DESTDIR}/usr/lib/gcc/${tgt}/${gcc_minor} \
+		${DESTDIR}/usr/lib/gcc/${tgt}/${gcc_patch}
 
 	# ditto for c++ headers
 	mv ${DESTDIR}/${sysroot}/usr/include/c++/${gcc_patch} \
diff --git a/srcpkgs/cross-aarch64-linux-gnu/template b/srcpkgs/cross-aarch64-linux-gnu/template
index 3d43f58afcb..18de21aa3cc 100644
--- a/srcpkgs/cross-aarch64-linux-gnu/template
+++ b/srcpkgs/cross-aarch64-linux-gnu/template
@@ -1,10 +1,9 @@
 # Template file for 'cross-aarch64-linux-gnu'
-_triplet=aarch64-linux-gnu
 _binutils_version=2.35.1
 _gcc_version=10.2.1_pre1
 _glibc_version=2.32
 _linux_version=5.10.4
-pkgname=cross-${_triplet}
+pkgname=cross-aarch64-linux-gnu
 version=0.34
 revision=1
 build_style=void-cross
@@ -12,7 +11,7 @@ configure_args="--with-arch=armv8-a"
 hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
 depends="${pkgname}-libc-${version}_${revision}"
-short_desc="Void cross toolchain for ${_triplet}"
+short_desc="Void cross toolchain for ${pkgname/cross-}"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.voidlinux.org/"
@@ -27,7 +26,6 @@ checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
  904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
 nocross=yes
 
-cross_triplet=${_triplet}
 cross_glibc_cflags="-O2 -march=armv8-a"
 
 if [ "$XBPS_TARGET_MACHINE" = "aarch64" ]; then
@@ -46,6 +44,6 @@ cross-aarch64-linux-gnu-libc_package() {
 	noverifyrdeps=yes
 
 	pkg_install() {
-		vmove usr/${cross_triplet}
+		vmove usr/${sourcepkg/cross-}
 	}
 }
diff --git a/srcpkgs/cross-aarch64-linux-musl/template b/srcpkgs/cross-aarch64-linux-musl/template
index 35bcd1a96e9..0f7b2e452be 100644
--- a/srcpkgs/cross-aarch64-linux-musl/template
+++ b/srcpkgs/cross-aarch64-linux-musl/template
@@ -1,11 +1,10 @@
 # Template file for 'cross-aarch64-linux-musl'
-_triplet=aarch64-linux-musl
 _binutils_version=2.35.1
 _gcc_version=10.2.1_pre1
 _musl_version=1.1.24
 _linux_version=5.10.4
 _libucontext_version=1.0
-pkgname=cross-${_triplet}
+pkgname=cross-aarch64-linux-musl
 version=0.34
 revision=2
 build_style=void-cross
@@ -13,7 +12,7 @@ configure_args="--with-arch=armv8-a"
 hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
 depends="${pkgname}-libc-${version}_${revision}"
-short_desc="Void cross toolchain for ${_triplet}"
+short_desc="Void cross toolchain for ${pkgname/cross-}"
 maintainer="Orphaned <orphan@voidlinux.org>"
 homepage="https://www.voidlinux.org/"
 license="GPL-2.0-or-later, GPL-3.0-or-later, MIT"
@@ -30,7 +29,6 @@ checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
  23714e99a87f6dea82e8a073c526325161dd65462459820b16a6162be91955bb"
 nocross=yes
 
-cross_triplet=${_triplet}
 cross_musl_cflags="-O2 -march=armv8-a"
 
 if [ "$XBPS_TARGET_MACHINE" = "aarch64-musl" ]; then
@@ -49,6 +47,6 @@ cross-aarch64-linux-musl-libc_package() {
 	noverifyrdeps=yes
 
 	pkg_install() {
-		vmove usr/${cross_triplet}
+		vmove usr/${sourcepkg/cross-}
 	}
 }
diff --git a/srcpkgs/cross-arm-linux-gnueabi/template b/srcpkgs/cross-arm-linux-gnueabi/template
index 5b046ff94b9..a3aba72aa93 100644
--- a/srcpkgs/cross-arm-linux-gnueabi/template
+++ b/srcpkgs/cross-arm-linux-gnueabi/template
@@ -1,10 +1,9 @@
 # Template file for 'cross-arm-linux-gnueabi'
-_triplet=arm-linux-gnueabi
 _binutils_version=2.35.1
 _gcc_version=10.2.1_pre1
 _glibc_version=2.32
 _linux_version=5.10.4
-pkgname=cross-${_triplet}
+pkgname=cross-arm-linux-gnueabi
 version=0.34
 revision=1
 build_style=void-cross
@@ -12,7 +11,7 @@ configure_args="--with-arch=armv5te --with-float=soft"
 hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
 depends="${pkgname}-libc-${version}_${revision}"
-short_desc="Void cross toolchain for ${_triplet}"
+short_desc="Void cross toolchain for ${pkgname/cross-}"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.voidlinux.org/"
@@ -27,7 +26,6 @@ checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
  904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
 nocross=yes
 
-cross_triplet=${_triplet}
 cross_binutils_configure_args="--without-fp"
 cross_glibc_configure_args="--without-fp"
 cross_glibc_cflags="-Os -march=armv5te -msoft-float -mfloat-abi=soft"
@@ -48,6 +46,6 @@ cross-arm-linux-gnueabi-libc_package() {
 	noverifyrdeps=yes
 
 	pkg_install() {
-		vmove usr/${cross_triplet}
+		vmove usr/${sourcepkg/cross-}
 	}
 }
diff --git a/srcpkgs/cross-arm-linux-gnueabihf/template b/srcpkgs/cross-arm-linux-gnueabihf/template
index 19f29bc2790..d9ab86cf2ec 100644
--- a/srcpkgs/cross-arm-linux-gnueabihf/template
+++ b/srcpkgs/cross-arm-linux-gnueabihf/template
@@ -1,10 +1,9 @@
 # Template file for 'cross-arm-linux-gnueabihf'
-_triplet=arm-linux-gnueabihf
 _binutils_version=2.35.1
 _gcc_version=10.2.1_pre1
 _glibc_version=2.32
 _linux_version=5.10.4
-pkgname=cross-${_triplet}
+pkgname=cross-arm-linux-gnueabihf
 version=0.34
 revision=1
 build_style=void-cross
@@ -12,7 +11,7 @@ configure_args="--with-arch=armv6 --with-fpu=vfp --with-float=hard"
 hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
 depends="${pkgname}-libc-${version}_${revision}"
-short_desc="Void cross toolchain for ${_triplet}"
+short_desc="Void cross toolchain for ${pkgname/cross-}"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.voidlinux.org/"
@@ -27,7 +26,6 @@ checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
  904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
 nocross=yes
 
-cross_triplet=${_triplet}
 cross_glibc_cflags="-Os -march=armv6 -mfpu=vfp -mfloat-abi=hard"
 
 if [ "$XBPS_TARGET_MACHINE" = "armv6l" ]; then
@@ -46,6 +44,6 @@ cross-arm-linux-gnueabihf-libc_package() {
 	noverifyrdeps=yes
 
 	pkg_install() {
-		vmove usr/${cross_triplet}
+		vmove usr/${sourcepkg/cross-}
 	}
 }
diff --git a/srcpkgs/cross-arm-linux-musleabi/template b/srcpkgs/cross-arm-linux-musleabi/template
index 02ccfe195d2..ef61b17d1ea 100644
--- a/srcpkgs/cross-arm-linux-musleabi/template
+++ b/srcpkgs/cross-arm-linux-musleabi/template
@@ -1,11 +1,10 @@
 # Template file for 'cross-arm-linux-musleabi'
-_triplet=arm-linux-musleabi
 _binutils_version=2.35.1
 _gcc_version=10.2.1_pre1
 _musl_version=1.1.24
 _linux_version=5.10.4
 _libucontext_version=1.0
-pkgname=cross-${_triplet}
+pkgname=cross-arm-linux-musleabi
 version=0.34
 revision=2
 build_style=void-cross
@@ -13,7 +12,7 @@ configure_args="--with-arch=armv5te --with-float=soft"
 hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
 depends="${pkgname}-libc-${version}_${revision}"
-short_desc="Void cross toolchain for ${_triplet}"
+short_desc="Void cross toolchain for ${pkgname/cross-}"
 maintainer="Orphaned <orphan@voidlinux.org>"
 homepage="https://www.voidlinux.org/"
 license="GPL-2.0-or-later, GPL-3.0-or-later, MIT"
@@ -30,7 +29,6 @@ checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
  23714e99a87f6dea82e8a073c526325161dd65462459820b16a6162be91955bb"
 nocross=yes
 
-cross_triplet=${_triplet}
 cross_binutils_configure_args="--without-fp"
 cross_musl_cflags="-Os -march=armv5te -msoft-float -mfloat-abi=soft"
 
@@ -50,6 +48,6 @@ cross-arm-linux-musleabi-libc_package() {
 	noverifyrdeps=yes
 
 	pkg_install() {
-		vmove usr/${cross_triplet}
+		vmove usr/${sourcepkg/cross-}
 	}
 }
diff --git a/srcpkgs/cross-arm-linux-musleabihf/template b/srcpkgs/cross-arm-linux-musleabihf/template
index 4493d2cf4be..9e312c4c463 100644
--- a/srcpkgs/cross-arm-linux-musleabihf/template
+++ b/srcpkgs/cross-arm-linux-musleabihf/template
@@ -1,11 +1,10 @@
 # Template file for 'cross-arm-linux-musleabihf'
-_triplet=arm-linux-musleabihf
 _binutils_version=2.35.1
 _gcc_version=10.2.1_pre1
 _musl_version=1.1.24
 _linux_version=5.10.4
 _libucontext_version=1.0
-pkgname=cross-${_triplet}
+pkgname=cross-arm-linux-musleabihf
 version=0.34
 revision=2
 build_style=void-cross
@@ -13,7 +12,7 @@ configure_args="--with-arch=armv6 --with-fpu=vfp --with-float=hard"
 hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
 depends="${pkgname}-libc-${version}_${revision}"
-short_desc="Void cross toolchain for ${_triplet}"
+short_desc="Void cross toolchain for ${pkgname/cross-}"
 maintainer="Orphaned <orphan@voidlinux.org>"
 homepage="https://www.voidlinux.org/"
 license="GPL-2.0-or-later, GPL-3.0-or-later, MIT"
@@ -30,7 +29,6 @@ checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
  23714e99a87f6dea82e8a073c526325161dd65462459820b16a6162be91955bb"
 nocross=yes
 
-cross_triplet=${_triplet}
 cross_musl_cflags="-Os -march=armv6 -mfpu=vfp -mfloat-abi=hard"
 
 if [ "$XBPS_TARGET_MACHINE" = "armv6l-musl" ]; then
@@ -49,6 +47,6 @@ cross-arm-linux-musleabihf-libc_package() {
 	noverifyrdeps=yes
 
 	pkg_install() {
-		vmove usr/${cross_triplet}
+		vmove usr/${sourcepkg/cross-}
 	}
 }
diff --git a/srcpkgs/cross-armv7l-linux-gnueabihf/template b/srcpkgs/cross-armv7l-linux-gnueabihf/template
index abe150f2a27..30c89b6294e 100644
--- a/srcpkgs/cross-armv7l-linux-gnueabihf/template
+++ b/srcpkgs/cross-armv7l-linux-gnueabihf/template
@@ -1,10 +1,9 @@
 # Template file for 'cross-armv7l-linux-gnueabihf'
-_triplet=armv7l-linux-gnueabihf
 _binutils_version=2.35.1
 _gcc_version=10.2.1_pre1
 _glibc_version=2.32
 _linux_version=5.10.4
-pkgname=cross-${_triplet}
+pkgname=cross-armv7l-linux-gnueabihf
 version=0.34
 revision=1
 build_style=void-cross
@@ -12,7 +11,7 @@ configure_args="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard"
 hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
 depends="${pkgname}-libc-${version}_${revision}"
-short_desc="Void cross toolchain for ${_triplet}"
+short_desc="Void cross toolchain for ${pkgname/cross-}"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.voidlinux.org/"
@@ -27,7 +26,6 @@ checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
  904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
 nocross=yes
 
-cross_triplet=${_triplet}
 cross_glibc_cflags="-O2 -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard"
 
 if [ "$XBPS_TARGET_MACHINE" = "armv7l" ]; then
@@ -46,6 +44,6 @@ cross-armv7l-linux-gnueabihf-libc_package() {
 	noverifyrdeps=yes
 
 	pkg_install() {
-		vmove usr/${cross_triplet}
+		vmove usr/${sourcepkg/cross-}
 	}
 }
diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/template b/srcpkgs/cross-armv7l-linux-musleabihf/template
index b0c0339cd1b..a26bdb85000 100644
--- a/srcpkgs/cross-armv7l-linux-musleabihf/template
+++ b/srcpkgs/cross-armv7l-linux-musleabihf/template
@@ -1,11 +1,10 @@
 # Template file for 'cross-armv7l-linux-musleabihf'
-_triplet=armv7l-linux-musleabihf
 _binutils_version=2.35.1
 _gcc_version=10.2.1_pre1
 _musl_version=1.1.24
 _linux_version=5.10.4
 _libucontext_version=1.0
-pkgname=cross-${_triplet}
+pkgname=cross-armv7l-linux-musleabihf
 version=0.34
 revision=2
 build_style=void-cross
@@ -13,7 +12,7 @@ configure_args="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard"
 hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
 depends="${pkgname}-libc-${version}_${revision}"
-short_desc="Void cross toolchain for ${_triplet}"
+short_desc="Void cross toolchain for ${pkgname/cross-}"
 maintainer="Orphaned <orphan@voidlinux.org>"
 homepage="https://www.voidlinux.org/"
 license="GPL-2.0-or-later, GPL-3.0-or-later, MIT"
@@ -30,7 +29,6 @@ checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
  23714e99a87f6dea82e8a073c526325161dd65462459820b16a6162be91955bb"
 nocross=yes
 
-cross_triplet=${_triplet}
 cross_musl_cflags="-O2 -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard"
 
 if [ "$XBPS_TARGET_MACHINE" = "armv7l-musl" ]; then
@@ -49,6 +47,6 @@ cross-armv7l-linux-musleabihf-libc_package() {
 	noverifyrdeps=yes
 
 	pkg_install() {
-		vmove usr/${cross_triplet}
+		vmove usr/${sourcepkg/cross-}
 	}
 }
diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template
index 1df55566142..6864371d1c8 100644
--- a/srcpkgs/cross-i686-linux-musl/template
+++ b/srcpkgs/cross-i686-linux-musl/template
@@ -1,18 +1,17 @@
 # Template file for 'cross-i686-linux-musl'
-_triplet=i686-linux-musl
 _binutils_version=2.35.1
 _gcc_version=10.2.1_pre1
 _musl_version=1.1.24
 _linux_version=5.10.4
 _libucontext_version=1.0
-pkgname=cross-${_triplet}
+pkgname=cross-i686-linux-musl
 version=0.34
 revision=2
 build_style=void-cross
 hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
 depends="${pkgname}-libc-${version}_${revision}"
-short_desc="Void cross toolchain for ${_triplet}"
+short_desc="Void cross toolchain for ${pkgname/cross-}"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 homepage="https://www.voidlinux.org/"
 license="GPL-2.0-or-later, GPL-3.0-or-later, MIT"
@@ -29,7 +28,6 @@ checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
  23714e99a87f6dea82e8a073c526325161dd65462459820b16a6162be91955bb"
 nocross=yes
 
-cross_triplet=${_triplet}
 # explicitly enable for final gcc, as gfortran does not build without on x86
 cross_gcc_configure_args="--enable-libquadmath"
 cross_musl_cflags="-O2 -march=i686 -mtune=generic"
@@ -50,6 +48,6 @@ cross-i686-linux-musl-libc_package() {
 	noshlibprovides=yes
 
 	pkg_install() {
-		vmove usr/${cross_triplet}
+		vmove usr/${sourcepkg/cross-}
 	}
 }
diff --git a/srcpkgs/cross-i686-pc-linux-gnu/template b/srcpkgs/cross-i686-pc-linux-gnu/template
index 7fa37de528f..d63680b6572 100644
--- a/srcpkgs/cross-i686-pc-linux-gnu/template
+++ b/srcpkgs/cross-i686-pc-linux-gnu/template
@@ -1,17 +1,16 @@
 # Template file for 'cross-i686-pc-linux-gnu'
-_triplet=i686-pc-linux-gnu
 _binutils_version=2.35.1
 _gcc_version=10.2.1_pre1
 _glibc_version=2.32
 _linux_version=5.10.4
-pkgname=cross-${_triplet}
+pkgname=cross-i686-pc-linux-gnu
 version=0.34
 revision=1
 build_style=void-cross
 hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
 depends="${pkgname}-libc-${version}_${revision}"
-short_desc="Void cross toolchain for ${_triplet}"
+short_desc="Void cross toolchain for ${pkgname/cross-}"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.voidlinux.org/"
@@ -26,7 +25,6 @@ checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
  904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
 nocross=yes
 
-cross_triplet=${_triplet}
 # explicitly enable for final gcc, as gfortran does not build without on x86
 cross_gcc_configure_args="--enable-libquadmath"
 cross_glibc_cflags="-O2 -Wno-error -march=i686 -mtune=generic"
@@ -47,6 +45,6 @@ cross-i686-pc-linux-gnu-libc_package() {
 	noshlibprovides=yes
 
 	pkg_install() {
-		vmove usr/${cross_triplet}
+		vmove usr/${sourcepkg/cross-}
 	}
 }
diff --git a/srcpkgs/cross-mips-linux-musl/template b/srcpkgs/cross-mips-linux-musl/template
index fb671e54c2e..b399304ca86 100644
--- a/srcpkgs/cross-mips-linux-musl/template
+++ b/srcpkgs/cross-mips-linux-musl/template
@@ -1,10 +1,9 @@
 # Template file for 'cross-mips-linux-musl'
-_triplet=mips-linux-musl
 _binutils_version=2.35.1
 _gcc_version=10.2.1_pre1
 _musl_version=1.1.24
 _linux_version=5.10.4
-pkgname=cross-${_triplet}
+pkgname=cross-mips-linux-musl
 version=0.34
 revision=1
 build_style=void-cross
@@ -13,7 +12,7 @@ configure_args="--with-arch=mips32r2 --with-float=soft
 hostmakedepends="texinfo tar gcc-objc flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
 depends="${pkgname}-libc-${version}_${revision}"
-short_desc="Void cross toolchain for ${_triplet}"
+short_desc="Void cross toolchain for ${pkgname/cross-}"
 maintainer="Orphaned <orphan@voidlinux.org>"
 homepage="https://www.voidlinux.org/"
 license="GPL-2.0-or-later, GPL-3.0-or-later, MIT"
@@ -28,7 +27,6 @@ checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
  904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
 nocross=yes
 
-cross_triplet=${_triplet}
 cross_gcc_skip_go=yes
 cross_binutils_configure_args="--without-fp --enable-default-hash-style=sysv"
 cross_musl_cflags="-Os -march=mips32r2 -msoft-float"
@@ -40,6 +38,6 @@ cross-mips-linux-musl-libc_package() {
 	noshlibprovides=yes
 
 	pkg_install() {
-		vmove usr/${cross_triplet}
+		vmove usr/${sourcepkg/cross-}
 	}
 }
diff --git a/srcpkgs/cross-mips-linux-muslhf/template b/srcpkgs/cross-mips-linux-muslhf/template
index cbf1a772b7c..7772047acc3 100644
--- a/srcpkgs/cross-mips-linux-muslhf/template
+++ b/srcpkgs/cross-mips-linux-muslhf/template
@@ -1,10 +1,9 @@
 # Template file for 'cross-mips-linux-muslhf'
-_triplet=mips-linux-muslhf
 _binutils_version=2.35.1
 _gcc_version=10.2.1_pre1
 _musl_version=1.1.24
 _linux_version=5.10.4
-pkgname=cross-${_triplet}
+pkgname=cross-mips-linux-muslhf
 version=0.34
 revision=1
 build_style=void-cross
@@ -13,7 +12,7 @@ configure_args="--with-arch=mips32r2 --with-float=hard
 hostmakedepends="texinfo tar gcc-objc flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
 depends="${pkgname}-libc-${version}_${revision}"
-short_desc="Void cross toolchain for ${_triplet}"
+short_desc="Void cross toolchain for ${pkgname/cross-}"
 maintainer="hipperson0 <hipperson0@gmail.com>"
 homepage="https://www.voidlinux.org/"
 license="GPL-2.0-or-later, GPL-3.0-or-later, MIT"
@@ -28,7 +27,6 @@ checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
  904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
 nocross=yes
 
-cross_triplet=${_triplet}
 cross_gcc_skip_go=yes
 cross_binutils_configure_args="--enable-default-hash-style=sysv"
 cross_musl_cflags="-Os -march=mips32r2 -mhard-float"
@@ -40,6 +38,6 @@ cross-mips-linux-muslhf-libc_package() {
 	noshlibprovides=yes
 
 	pkg_install() {
-		vmove usr/${cross_triplet}
+		vmove usr/${sourcepkg/cross-}
 	}
 }
diff --git a/srcpkgs/cross-mipsel-linux-musl/template b/srcpkgs/cross-mipsel-linux-musl/template
index b233f9a23d2..781c62b94f4 100644
--- a/srcpkgs/cross-mipsel-linux-musl/template
+++ b/srcpkgs/cross-mipsel-linux-musl/template
@@ -1,10 +1,9 @@
 # Template file for 'cross-mipsel-linux-musl'
-_triplet=mipsel-linux-musl
 _binutils_version=2.35.1
 _gcc_version=10.2.1_pre1
 _musl_version=1.1.24
 _linux_version=5.10.4
-pkgname=cross-${_triplet}
+pkgname=cross-mipsel-linux-musl
 version=0.34
 revision=1
 build_style=void-cross
@@ -13,7 +12,7 @@ configure_args="--with-arch=mips32r2 --with-float=soft
 hostmakedepends="texinfo tar gcc-objc flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
 depends="${pkgname}-libc-${version}_${revision}"
-short_desc="Void cross toolchain for ${_triplet}"
+short_desc="Void cross toolchain for ${pkgname/cross-}"
 maintainer="Orphaned <orphan@voidlinux.org>"
 homepage="https://www.voidlinux.org/"
 license="GPL-2.0-or-later, GPL-3.0-or-later, MIT"
@@ -28,7 +27,6 @@ checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
  904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
 nocross=yes
 
-cross_triplet=${_triplet}
 cross_gcc_skip_go=yes
 cross_binutils_configure_args="--without-fp --enable-default-hash-style=sysv"
 cross_musl_cflags="-Os -march=mips32r2 -msoft-float"
@@ -40,6 +38,6 @@ cross-mipsel-linux-musl-libc_package() {
 	noshlibprovides=yes
 
 	pkg_install() {
-		vmove usr/${cross_triplet}
+		vmove usr/${sourcepkg/cross-}
 	}
 }
diff --git a/srcpkgs/cross-mipsel-linux-muslhf/template b/srcpkgs/cross-mipsel-linux-muslhf/template
index 82f902532f1..6614861c8dd 100644
--- a/srcpkgs/cross-mipsel-linux-muslhf/template
+++ b/srcpkgs/cross-mipsel-linux-muslhf/template
@@ -1,10 +1,9 @@
 # Template file for 'cross-mipsel-linux-muslhf'
-_triplet=mipsel-linux-muslhf
 _binutils_version=2.35.1
 _gcc_version=10.2.1_pre1
 _musl_version=1.1.24
 _linux_version=5.10.4
-pkgname=cross-${_triplet}
+pkgname=cross-mipsel-linux-muslhf
 version=0.34
 revision=1
 build_style=void-cross
@@ -13,7 +12,7 @@ configure_args="--with-arch=mips32r2 --with-float=hard
 hostmakedepends="texinfo tar gcc-objc flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
 depends="${pkgname}-libc-${version}_${revision}"
-short_desc="Void cross toolchain for ${_triplet}"
+short_desc="Void cross toolchain for ${pkgname/cross-}"
 maintainer="Orphaned <orphan@voidlinux.org>"
 homepage="https://www.voidlinux.org/"
 license="GPL-2.0-or-later, GPL-3.0-or-later, MIT"
@@ -28,7 +27,6 @@ checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
  904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
 nocross=yes
 
-cross_triplet=${_triplet}
 cross_gcc_skip_go=yes
 cross_binutils_configure_args="--enable-default-hash-style=sysv"
 cross_musl_cflags="-Os -march=mips32r2 -mhard-float"
@@ -40,6 +38,6 @@ cross-mipsel-linux-muslhf-libc_package() {
 	noshlibprovides=yes
 
 	pkg_install() {
-		vmove usr/${cross_triplet}
+		vmove usr/${sourcepkg/cross-}
 	}
 }
diff --git a/srcpkgs/cross-powerpc-linux-gnu/template b/srcpkgs/cross-powerpc-linux-gnu/template
index 98c8d18bba8..b97a21d0d72 100644
--- a/srcpkgs/cross-powerpc-linux-gnu/template
+++ b/srcpkgs/cross-powerpc-linux-gnu/template
@@ -1,10 +1,9 @@
 # Template file for 'cross-powerpc-linux-gnu'
-_triplet=powerpc-linux-gnu
 _binutils_version=2.35.1
 _gcc_version=10.2.1_pre1
 _glibc_version=2.32
 _linux_version=5.10.4
-pkgname=cross-${_triplet}
+pkgname=cross-powerpc-linux-gnu
 version=0.34
 revision=1
 build_style=void-cross
@@ -12,7 +11,7 @@ configure_args="--enable-secureplt --disable-vtable-verify"
 hostmakedepends="texinfo tar gcc-objc flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
 depends="${pkgname}-libc-${version}_${revision}"
-short_desc="Void cross toolchain for ${_triplet}"
+short_desc="Void cross toolchain for ${pkgname/cross-}"
 maintainer="Thomas Batten <stenstorpmc@gmail.com>"
 license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.voidlinux.org/"
@@ -27,7 +26,6 @@ checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
  904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
 nocross=yes
 
-cross_triplet=${_triplet}
 cross_gcc_skip_go=yes
 cross_binutils_configure_args="--enable-secureplt"
 cross_gcc_bootstrap_configure_args="--with-long-double-128"
@@ -44,6 +42,6 @@ cross-powerpc-linux-gnu-libc_package() {
 	noverifyrdeps=yes
 
 	pkg_install() {
-		vmove usr/${cross_triplet}
+		vmove usr/${sourcepkg/cross-}
 	}
 }
diff --git a/srcpkgs/cross-powerpc-linux-musl/template b/srcpkgs/cross-powerpc-linux-musl/template
index d2861b10e12..ba99a31b283 100644
--- a/srcpkgs/cross-powerpc-linux-musl/template
+++ b/srcpkgs/cross-powerpc-linux-musl/template
@@ -1,10 +1,9 @@
 # Template file for 'cross-powerpc-linux-musl'
-_triplet=powerpc-linux-musl
 _binutils_version=2.35.1
 _gcc_version=10.2.1_pre1
 _musl_version=1.1.24
 _linux_version=5.10.4
-pkgname=cross-${_triplet}
+pkgname=cross-powerpc-linux-musl
 version=0.34
 revision=1
 build_style=void-cross
@@ -13,7 +12,7 @@ configure_args="--enable-secureplt --disable-vtable-verify
 hostmakedepends="texinfo tar gcc-objc flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
 depends="${pkgname}-libc-${version}_${revision}"
-short_desc="Void cross toolchain for ${_triplet}"
+short_desc="Void cross toolchain for ${pkgname/cross-}"
 maintainer="Thomas Batten <stenstorpmc@gmail.com>"
 homepage="https://www.voidlinux.org/"
 license="GPL-2.0-or-later, GPL-3.0-or-later, MIT"
@@ -28,7 +27,6 @@ checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
  904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
 nocross=yes
 
-cross_triplet=${_triplet}
 cross_gcc_skip_go=yes
 cross_binutils_configure_args="--enable-secureplt"
 cross_musl_cflags="-O2"
@@ -44,6 +42,6 @@ cross-powerpc-linux-musl-libc_package() {
 	noshlibprovides=yes
 
 	pkg_install() {
-		vmove usr/${cross_triplet}
+		vmove usr/${sourcepkg/cross-}
 	}
 }
diff --git a/srcpkgs/cross-powerpc64-linux-gnu/template b/srcpkgs/cross-powerpc64-linux-gnu/template
index 720e3859d10..c99c7dd1e97 100644
--- a/srcpkgs/cross-powerpc64-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64-linux-gnu/template
@@ -1,10 +1,9 @@
 # Template file for 'cross-powerpc64-linux-gnu'
-_triplet=powerpc64-linux-gnu
 _binutils_version=2.35.1
 _gcc_version=10.2.1_pre1
 _glibc_version=2.32
 _linux_version=5.10.4
-pkgname=cross-${_triplet}
+pkgname=cross-powerpc64-linux-gnu
 version=0.34
 revision=1
 build_style=void-cross
@@ -13,7 +12,7 @@ configure_args="--enable-secureplt --disable-vtable-verify --with-abi=elfv2
 hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
 depends="${pkgname}-libc-${version}_${revision}"
-short_desc="Void cross toolchain for ${_triplet}"
+short_desc="Void cross toolchain for ${pkgname/cross-}"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.voidlinux.org/"
@@ -28,7 +27,6 @@ checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
  904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
 nocross=yes
 
-cross_triplet=${_triplet}
 cross_binutils_configure_args="--enable-secureplt"
 cross_gcc_bootstrap_configure_args="--with-long-double-128"
 cross_glibc_cflags="-O2"
@@ -49,6 +47,6 @@ cross-powerpc64-linux-gnu-libc_package() {
 	noshlibprovides=yes
 
 	pkg_install() {
-		vmove usr/${cross_triplet}
+		vmove usr/${sourcepkg/cross-}
 	}
 }
diff --git a/srcpkgs/cross-powerpc64-linux-musl/template b/srcpkgs/cross-powerpc64-linux-musl/template
index 51abb778826..05482636bbd 100644
--- a/srcpkgs/cross-powerpc64-linux-musl/template
+++ b/srcpkgs/cross-powerpc64-linux-musl/template
@@ -1,11 +1,10 @@
 # Template file for 'cross-powerpc64-linux-musl'
-_triplet=powerpc64-linux-musl
 _binutils_version=2.35.1
 _gcc_version=10.2.1_pre1
 _musl_version=1.1.24
 _linux_version=5.10.4
 _libucontext_version=1.0
-pkgname=cross-${_triplet}
+pkgname=cross-powerpc64-linux-musl
 version=0.34
 revision=2
 build_style=void-cross
@@ -14,7 +13,7 @@ configure_args="--enable-secureplt --disable-vtable-verify
 hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
 depends="${pkgname}-libc-${version}_${revision}"
-short_desc="Void cross toolchain for ${_triplet}"
+short_desc="Void cross toolchain for ${pkgname/cross-}"
 maintainer="q66 <daniel@octaforge.org>"
 homepage="https://www.voidlinux.org/"
 license="GPL-2.0-or-later, GPL-3.0-or-later, MIT"
@@ -31,7 +30,6 @@ checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
  23714e99a87f6dea82e8a073c526325161dd65462459820b16a6162be91955bb"
 nocross=yes
 
-cross_triplet=${_triplet}
 cross_binutils_configure_args="--enable-secureplt"
 cross_musl_cflags="-O2"
 
@@ -51,6 +49,6 @@ cross-powerpc64-linux-musl-libc_package() {
 	noshlibprovides=yes
 
 	pkg_install() {
-		vmove usr/${cross_triplet}
+		vmove usr/${sourcepkg/cross-}
 	}
 }
diff --git a/srcpkgs/cross-powerpc64le-linux-gnu/template b/srcpkgs/cross-powerpc64le-linux-gnu/template
index 4dfb40ce391..733f5851da5 100644
--- a/srcpkgs/cross-powerpc64le-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64le-linux-gnu/template
@@ -1,10 +1,9 @@
 # Template file for 'cross-powerpc64le-linux-gnu'
-_triplet=powerpc64le-linux-gnu
 _binutils_version=2.35.1
 _gcc_version=10.2.1_pre1
 _glibc_version=2.32
 _linux_version=5.10.4
-pkgname=cross-${_triplet}
+pkgname=cross-powerpc64le-linux-gnu
 version=0.34
 revision=1
 build_style=void-cross
@@ -13,7 +12,7 @@ configure_args="--enable-secureplt --disable-vtable-verify --with-abi=elfv2
 hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
 depends="${pkgname}-libc-${version}_${revision}"
-short_desc="Void cross toolchain for ${_triplet}"
+short_desc="Void cross toolchain for ${pkgname/cross-}"
 maintainer="q66 <daniel@octaforge.org>"
 license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.voidlinux.org/"
@@ -28,7 +27,6 @@ checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
  904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
 nocross=yes
 
-cross_triplet=${_triplet}
 cross_binutils_configure_args="--enable-secureplt"
 cross_gcc_bootstrap_configure_args="--with-long-double-128"
 # explicitly enable for final gcc, gfortran does not build without on ppc64le
@@ -51,6 +49,6 @@ cross-powerpc64le-linux-gnu-libc_package() {
 	noshlibprovides=yes
 
 	pkg_install() {
-		vmove usr/${cross_triplet}
+		vmove usr/${sourcepkg/cross-}
 	}
 }
diff --git a/srcpkgs/cross-powerpc64le-linux-musl/template b/srcpkgs/cross-powerpc64le-linux-musl/template
index 2e86ed57f57..654536bf08a 100644
--- a/srcpkgs/cross-powerpc64le-linux-musl/template
+++ b/srcpkgs/cross-powerpc64le-linux-musl/template
@@ -1,11 +1,10 @@
 # Template file for 'cross-powerpc64le-linux-musl'
-_triplet=powerpc64le-linux-musl
 _binutils_version=2.35.1
 _gcc_version=10.2.1_pre1
 _musl_version=1.1.24
 _linux_version=5.10.4
 _libucontext_version=1.0
-pkgname=cross-${_triplet}
+pkgname=cross-powerpc64le-linux-musl
 version=0.34
 revision=2
 build_style=void-cross
@@ -14,7 +13,7 @@ configure_args="--enable-secureplt --disable-vtable-verify
 hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
 depends="${pkgname}-libc-${version}_${revision}"
-short_desc="Void cross toolchain for ${_triplet}"
+short_desc="Void cross toolchain for ${pkgname/cross-}"
 maintainer="q66 <daniel@octaforge.org>"
 homepage="https://www.voidlinux.org/"
 license="GPL-2.0-or-later, GPL-3.0-or-later, MIT"
@@ -31,7 +30,6 @@ checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
  23714e99a87f6dea82e8a073c526325161dd65462459820b16a6162be91955bb"
 nocross=yes
 
-cross_triplet=${_triplet}
 cross_binutils_configure_args="--enable-secureplt"
 cross_musl_cflags="-O2"
 
@@ -51,6 +49,6 @@ cross-powerpc64le-linux-musl-libc_package() {
 	noshlibprovides=yes
 
 	pkg_install() {
-		vmove usr/${cross_triplet}
+		vmove usr/${sourcepkg/cross-}
 	}
 }
diff --git a/srcpkgs/cross-powerpcle-linux-gnu/template b/srcpkgs/cross-powerpcle-linux-gnu/template
index 9b081500e3d..347b8fcf4f5 100644
--- a/srcpkgs/cross-powerpcle-linux-gnu/template
+++ b/srcpkgs/cross-powerpcle-linux-gnu/template
@@ -1,10 +1,9 @@
 # Template file for 'cross-powerpcle-linux-gnu'
-_triplet=powerpcle-linux-gnu
 _binutils_version=2.35.1
 _gcc_version=10.2.1_pre1
 _glibc_version=2.32
 _linux_version=5.10.4
-pkgname=cross-${_triplet}
+pkgname=cross-powerpcle-linux-gnu
 version=0.34
 revision=1
 build_style=void-cross
@@ -12,7 +11,7 @@ configure_args="--enable-secureplt --disable-vtable-verify"
 hostmakedepends="texinfo tar gcc-objc flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
 depends="${pkgname}-libc-${version}_${revision}"
-short_desc="Void cross toolchain for ${_triplet}"
+short_desc="Void cross toolchain for ${pkgname/cross-}"
 maintainer="q66 <daniel@octaforge.org>"
 license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.voidlinux.org/"
@@ -27,7 +26,6 @@ checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
  904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
 nocross=yes
 
-cross_triplet=${_triplet}
 cross_gcc_skip_go=yes
 cross_binutils_configure_args="--enable-secureplt"
 cross_gcc_bootstrap_configure_args="--with-long-double-128"
@@ -44,6 +42,6 @@ cross-powerpcle-linux-gnu-libc_package() {
 	noverifyrdeps=yes
 
 	pkg_install() {
-		vmove usr/${cross_triplet}
+		vmove usr/${sourcepkg/cross-}
 	}
 }
diff --git a/srcpkgs/cross-powerpcle-linux-musl/template b/srcpkgs/cross-powerpcle-linux-musl/template
index 42500f043ea..a3db1b18422 100644
--- a/srcpkgs/cross-powerpcle-linux-musl/template
+++ b/srcpkgs/cross-powerpcle-linux-musl/template
@@ -1,10 +1,9 @@
 # Template file for 'cross-powerpcle-linux-musl'
-_triplet=powerpcle-linux-musl
 _binutils_version=2.35.1
 _gcc_version=10.2.1_pre1
 _musl_version=1.1.24
 _linux_version=5.10.4
-pkgname=cross-${_triplet}
+pkgname=cross-powerpcle-linux-musl
 version=0.34
 revision=1
 build_style=void-cross
@@ -13,7 +12,7 @@ configure_args="--enable-secureplt --disable-vtable-verify
 hostmakedepends="texinfo tar gcc-objc flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
 depends="${pkgname}-libc-${version}_${revision}"
-short_desc="Void cross toolchain for ${_triplet}"
+short_desc="Void cross toolchain for ${pkgname/cross-}"
 maintainer="q66 <daniel@octaforge.org>"
 homepage="https://www.voidlinux.org/"
 license="GPL-2.0-or-later, GPL-3.0-or-later, MIT"
@@ -28,7 +27,6 @@ checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
  904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
 nocross=yes
 
-cross_triplet=${_triplet}
 cross_gcc_skip_go=yes
 cross_binutils_configure_args="--enable-secureplt"
 cross_musl_cflags="-O2"
@@ -44,6 +42,6 @@ cross-powerpcle-linux-musl-libc_package() {
 	noshlibprovides=yes
 
 	pkg_install() {
-		vmove usr/${cross_triplet}
+		vmove usr/${sourcepkg/cross-}
 	}
 }
diff --git a/srcpkgs/cross-x86_64-linux-gnu/template b/srcpkgs/cross-x86_64-linux-gnu/template
index e71b403dbbc..0078fbe7224 100644
--- a/srcpkgs/cross-x86_64-linux-gnu/template
+++ b/srcpkgs/cross-x86_64-linux-gnu/template
@@ -1,17 +1,16 @@
 # Template file for 'cross-x86_64-linux-gnu'
-_triplet=x86_64-linux-gnu
 _binutils_version=2.35.1
 _gcc_version=10.2.1_pre1
 _glibc_version=2.32
 _linux_version=5.10.4
-pkgname=cross-${_triplet}
+pkgname=cross-x86_64-linux-gnu
 version=0.34
 revision=1
 build_style=void-cross
 hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
 depends="${pkgname}-libc-${version}_${revision}"
-short_desc="Void cross toolchain for ${_triplet}"
+short_desc="Void cross toolchain for ${pkgname/cross-}"
 maintainer="q66 <daniel@octaforge.org>"
 license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.voidlinux.org/"
@@ -26,7 +25,6 @@ checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
  904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
 nocross=yes
 
-cross_triplet=${_triplet}
 # explicitly enable for final gcc, gfortran does not build without on x86
 cross_gcc_configure_args="--enable-libquadmath"
 cross_glibc_cflags="-O2"
@@ -47,6 +45,6 @@ cross-x86_64-linux-gnu-libc_package() {
 	noshlibprovides=yes
 
 	pkg_install() {
-		vmove usr/${cross_triplet}
+		vmove usr/${sourcepkg/cross-}
 	}
 }
diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template
index 892526793ef..d44a4c1f5f5 100644
--- a/srcpkgs/cross-x86_64-linux-musl/template
+++ b/srcpkgs/cross-x86_64-linux-musl/template
@@ -1,18 +1,17 @@
 # Template file for 'cross-x86_64-linux-musl'
-_triplet=x86_64-linux-musl
 _binutils_version=2.35.1
 _gcc_version=10.2.1_pre1
 _musl_version=1.1.24
 _linux_version=5.10.4
 _libucontext_version=1.0
-pkgname=cross-${_triplet}
+pkgname=cross-x86_64-linux-musl
 version=0.34
 revision=1
 build_style=void-cross
 hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
 depends="${pkgname}-libc-${version}_${revision}"
-short_desc="Void cross toolchain for ${_triplet}"
+short_desc="Void cross toolchain for ${pkgname/cross-}"
 maintainer="Orphaned <orphan@voidlinux.org>"
 homepage="https://www.voidlinux.org/"
 license="GPL-2.0-or-later, GPL-3.0-or-later, MIT"
@@ -29,7 +28,6 @@ checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
  23714e99a87f6dea82e8a073c526325161dd65462459820b16a6162be91955bb"
 nocross=yes
 
-cross_triplet=${_triplet}
 # explicitly enable for final gcc, gfortran does not build without on x86
 cross_gcc_configure_args="--enable-libquadmath"
 cross_musl_cflags="-O2"
@@ -50,6 +48,6 @@ cross-x86_64-linux-musl-libc_package() {
 	noshlibprovides=yes
 
 	pkg_install() {
-		vmove usr/${cross_triplet}
+		vmove usr/${sourcepkg/cross-}
 	}
 }