From 260ce1acd271dea4955ad9d72a04ac0a96c10240 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 16 Oct 2019 23:40:47 +0200 Subject: [PATCH] build_style/meson.sh: add support for using qemu as exe_wrapper --- common/build-style/meson.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/common/build-style/meson.sh b/common/build-style/meson.sh index 160dc16b417..d318978ea59 100644 --- a/common/build-style/meson.sh +++ b/common/build-style/meson.sh @@ -69,6 +69,10 @@ cpu_family = '${_MESON_CPU_FAMILY}' cpu = '${_MESON_TARGET_CPU}' endian = '${_MESON_TARGET_ENDIAN}' EOF + if [ "${hostmakedepends}" != "${hostmakedepends/qemu-user-static/}" ]; then + sed -e "/\[binaries\]/ a exe_wrapper = '/usr/bin/qemu-${XBPS_TARGET_QEMU_MACHINE}-static'" \ + -i ${meson_crossfile} + fi unset _MESON_CPU_FAMILY _MESON_TARGET_CPU _MESON_TARGET_ENDIAN fi @@ -78,6 +82,7 @@ do_configure() { : ${meson_cmd:=meson} : ${meson_builddir:=build} : ${meson_crossfile:=xbps_meson.cross} + export QEMU_LD_PREFIX=${XBPS_CROSS_BASE} if [ "$CROSS_BUILD" ]; then configure_args+=" --cross-file=${meson_crossfile}" @@ -130,6 +135,7 @@ do_build() { : ${make_cmd:=ninja} : ${make_build_target:=all} : ${meson_builddir:=build} + export QEMU_LD_PREFIX=${XBPS_CROSS_BASE} ${make_cmd} -C ${meson_builddir} ${makejobs} ${make_build_args} ${make_build_target} } @@ -146,6 +152,7 @@ do_install() { : ${make_cmd:=ninja} : ${make_install_target:=install} : ${meson_builddir:=build} + export QEMU_LD_PREFIX=${XBPS_CROSS_BASE} DESTDIR=${DESTDIR} ${make_cmd} -C ${meson_builddir} ${make_install_args} ${make_install_target} }