From 7e4ddbdc55db62ce9780466e87403d91431fdcd1 Mon Sep 17 00:00:00 2001
From: Oliver Smith <ollieparanoid@postmarketos.org>
Date: Thu, 10 Jul 2025 21:35:34 +0200
Subject: [PATCH] cross/crossdirect: tweak package() variables

* make arches and compilers diff friendly
* order arches alphabetically
* rename _bin to _bin_compilers in preparation for _bin_archivers

Part-of: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/6763
---
 cross/crossdirect/APKBUILD | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/cross/crossdirect/APKBUILD b/cross/crossdirect/APKBUILD
index 84394c98a..713d62ee9 100644
--- a/cross/crossdirect/APKBUILD
+++ b/cross/crossdirect/APKBUILD
@@ -48,8 +48,22 @@ build() {
 
 package() {
 	# Architectures and binaries
-	_archs="x86_64 armhf armv7 aarch64 riscv64"
-	_bins="c++ cc cpp g++ gcc clang clang++"
+	_archs="
+		aarch64
+		armhf
+		armv7
+		riscv64
+		x86_64
+	"
+	_bin_compilers="
+		c++
+		cc
+		clang
+		clang++
+		cpp
+		g++
+		gcc
+	"
 
 	# Rust wrappers
 	install -Dm755 "$srcdir/rust-qemu-linker.sh" \
@@ -70,7 +84,7 @@ package() {
 		cp "$srcdir/crossdirect-$_arch" "./"
 
 		# GCC: create compiler symlinks
-		for _bin in $_bins; do
+		for _bin in $_bin_compilers; do
 			ln -s "crossdirect-$_arch" "$_bin"
 			ln -s "crossdirect-$_arch" "$_hostspec-$_bin"
 		done