From 0cfc368caf5ad454dd076a866410ef774930cd1d Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 25 Mar 2024 20:36:42 -0400
Subject: [PATCH] edk2-ovmf: enable on aarch64*

---
 srcpkgs/edk2-ovmf/template | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/srcpkgs/edk2-ovmf/template b/srcpkgs/edk2-ovmf/template
index 8b6e0dbcf89..7a3484dfea6 100644
--- a/srcpkgs/edk2-ovmf/template
+++ b/srcpkgs/edk2-ovmf/template
@@ -1,13 +1,13 @@
 # Template file for 'edk2-ovmf'
 pkgname=edk2-ovmf
 version=202402
-revision=1
+revision=2
 _mipi_commit=370b5944c046bab043dd8b133727b2135af7747a
 _openssl_version=3.0.9
 _mbedtls_commit=8c89224991adff88d53cd380f42a2baa36f91454
 _softfloat_commit=b64af41c3276f97f0e181920400ee056b9c88037
-hostmakedepends="acpica-utils nasm python3 cross-arm-none-eabi-gcc"
-makedepends="libuuid-devel"
+archs="x86_64* i686* aarch64*"
+hostmakedepends="acpica-utils nasm python3 libuuid-devel"
 short_desc="EFI Development Kit II - Open Virtual Machine Firmware"
 maintainer="classabbyamp <void@placeviolette.net>"
 license="BSD-2-Clause-Patent, MIT"
@@ -27,22 +27,20 @@ skip_extraction="${_mipi_commit}.tar.gz
  openssl-${_openssl_version}.tar.gz
  ${_mbedtls_commit}.tar.gz
  ${_softfloat_commit}.tar.gz"
-nocross="probably possible, but complex"
 
 case "$XBPS_TARGET_LIBC" in
-	glibc)
-		hostmakedepends+=" cross-aarch64-linux-gnu"
-		_pfx="gnu"
-	;;
-	musl)
-		hostmakedepends+=" cross-aarch64-linux-musl"
-		_pfx="musl"
-	;;
+	glibc) _pfx="gnu" ;;
+	musl) _pfx="musl" ;;
 esac
 
 case "$XBPS_MACHINE" in
+	x86_64*|i686*) hostmakedepends+=" cross-aarch64-linux-${_pfx} cross-arm-linux-${_pfx}eabihf" ;;
+esac
+
+case "$XBPS_TARGET_MACHINE" in
 	x86_64*) _archs=(X64 IA32 AARCH64 ARM) ;;
 	i686*) _archs=(IA32 AARCH64 ARM) ;;
+	aarch64*) _archs=(AARCH64) ;;
 esac
 
 post_extract() {
@@ -59,11 +57,15 @@ do_build() {
 	local _x86_args=(-D FD_SIZE_2MB -D HTTP_BOOT_ENABLE -D TLS_ENABLE)
 	local _4mb_args=(-D FD_SIZE_4MB -D FD_SIZE_IN_KB=4096 -D HTTP_BOOT_ENABLE -D TLS_ENABLE)
 
-	export GCC5_AARCH64_PREFIX="aarch64-linux-${_pfx}-"
-	export GCC5_ARM_PREFIX="arm-none-eabi-"
+	case "$XBPS_MACHINE" in
+		x86_64*|i686*)
+			export GCC5_AARCH64_PREFIX="aarch64-linux-${_pfx}-"
+			export GCC5_ARM_PREFIX="arm-linux-${_pfx}eabihf-"
+			;;
+	esac
 
-	for _arch in "" AARCH64 ARM; do
-		ARCH="$_arch" make "${makejobs}" -C BaseTools
+	for _arch in "${_archs[@]}"; do
+		CC=gcc CXX=g++ ARCH="${_arch}" make "${makejobs}" -C BaseTools
 	done
 	. edksetup.sh