From 869bcadd37ac8c25e0445c6727e339acdf2a97d2 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 24 Nov 2024 01:11:48 +0000
Subject: [PATCH] build: sync with upstream 2024-11-24
 https://github.com/void-linux/void-packages/commit/c01f676a

---
 common/build-helper/meson.sh                    |  6 +++---
 common/build-helper/qemu.sh                     |  2 +-
 common/hooks/pre-configure/02-script-wrapper.sh | 14 ++++++++++++++
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/common/build-helper/meson.sh b/common/build-helper/meson.sh
index e414afb..02fb515 100644
--- a/common/build-helper/meson.sh
+++ b/common/build-helper/meson.sh
@@ -69,13 +69,13 @@ cat > "${XBPS_WRAPPERDIR}/meson/xbps_meson.cross" <<-EOF
 	g-ir-scanner = '${XBPS_CROSS_BASE}/usr/bin/g-ir-scanner'
 	g-ir-compiler = '${XBPS_CROSS_BASE}/usr/bin/g-ir-compiler'
 	g-ir-generate = '${XBPS_CROSS_BASE}/usr/bin/g-ir-generate'
-	llvm-config = '/usr/bin/llvm-config'
+	llvm-config = 'llvm-config-qemu'
 	cups-config = '${XBPS_CROSS_BASE}/usr/bin/cups-config'
-	
+
 	[properties]
 	needs_exe_wrapper = true
 	bindgen_clang_arguments = ['-target', '${XBPS_CROSS_TRIPLET}']
-	
+
 	[host_machine]
 	system = 'linux'
 	cpu_family = '${_MESON_CPU_FAMILY}'
diff --git a/common/build-helper/qemu.sh b/common/build-helper/qemu.sh
index 4fbd5fb..cd3779c 100644
--- a/common/build-helper/qemu.sh
+++ b/common/build-helper/qemu.sh
@@ -5,7 +5,7 @@ fi
 
 vtargetrun() {
 	if [ "$CROSS_BUILD" ]; then
-		"/usr/bin/qemu-${XBPS_TARGET_QEMU_MACHINE}-static" "$@"
+		"/usr/bin/qemu-${XBPS_TARGET_QEMU_MACHINE}" "$@"
 	else
 		"$@"
 	fi
diff --git a/common/hooks/pre-configure/02-script-wrapper.sh b/common/hooks/pre-configure/02-script-wrapper.sh
index 004c684..02f3965 100644
--- a/common/hooks/pre-configure/02-script-wrapper.sh
+++ b/common/hooks/pre-configure/02-script-wrapper.sh
@@ -50,6 +50,19 @@ generic_wrapper3() {
 	chmod 755 ${XBPS_WRAPPERDIR}/${wrapper}
 }
 
+qemu_wrapper() {
+	local wrapper="$1"
+	[ ! -x ${XBPS_CROSS_BASE}/usr/bin/${wrapper} ] && return 0
+	[ -x ${XBPS_WRAPPERDIR}/${wrapper}-qemu ] && return 0
+
+cat >>${XBPS_WRAPPERDIR}/${wrapper}-qemu<<_EOF
+#!/bin/sh
+export QEMU_LD_PREFIX=${XBPS_CROSS_BASE}
+exec qemu-${XBPS_TARGET_QEMU_MACHINE} ${XBPS_CROSS_BASE}/usr/bin/${wrapper} "\$@"
+_EOF
+	chmod 755 ${XBPS_WRAPPERDIR}/${wrapper}-qemu
+}
+
 apr_apu_wrapper() {
 	local wrapper="$1"
 
@@ -240,4 +253,5 @@ hook() {
 	python_wrapper python-config 2.7
 	python_wrapper python3-config 3.12
 	apr_apu_wrapper apu-1-config
+	qemu_wrapper llvm-config
 }