From 22d65321ece2bc8a0f9928d0ec1a5911d62ada30 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Fri, 3 Sep 2021 09:20:27 -0700 Subject: [PATCH] package/gobject-introspection: Add QEMU_USERMODE_ARGS support Now that the qemu package has the BR2_PACKAGE_HOST_QEMU_USER_MODE_ARGS string, the gobject-introspection g-ir-scanner-qemuwrapper script can pass that string to qemu. Add the QEMU_USERMODE_ARGS to g-ir-scanner-qemuwrapper.in and unconditionally sed @QEMU_USERMODE_ARGS@ with BR2_PACKAGE_HOST_QEMU_USER_MODE_ARGS. Fixes: http://autobuild.buildroot.org/results/2e9dbc0d36600c09fa9e59ab1b1903c9f40661e8 Signed-off-by: Adam Duskett [Arnout: don't add QEMU_USERMODE_ARGS variable to shell script] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/gobject-introspection/g-ir-scanner-qemuwrapper.in | 1 + package/gobject-introspection/gobject-introspection.mk | 2 ++ 2 files changed, 3 insertions(+) diff --git a/package/gobject-introspection/g-ir-scanner-qemuwrapper.in b/package/gobject-introspection/g-ir-scanner-qemuwrapper.in index 85f0750b4d..9786feea40 100644 --- a/package/gobject-introspection/g-ir-scanner-qemuwrapper.in +++ b/package/gobject-introspection/g-ir-scanner-qemuwrapper.in @@ -8,6 +8,7 @@ GOI_LIBRARY_PATH="${GIR_EXTRA_LIBS_PATH:+${GIR_EXTRA_LIBS_PATH}:}.libs:$(dirname # which may then get deleted (or their dependencies) and potentially segfault GIO_MODULE_DIR="$(dirname "$0")/../lib/gio/modules-dummy" \ @QEMU_USER@ -r @TOOLCHAIN_HEADERS_VERSION@ \ + @QEMU_USERMODE_ARGS@ \ -L "$(dirname "$0")/../../" \ -E LD_LIBRARY_PATH="${GOI_LIBRARY_PATH}" \ "$@" diff --git a/package/gobject-introspection/gobject-introspection.mk b/package/gobject-introspection/gobject-introspection.mk index f34dca7278..6a3d321cc7 100644 --- a/package/gobject-introspection/gobject-introspection.mk +++ b/package/gobject-introspection/gobject-introspection.mk @@ -84,6 +84,8 @@ define GOBJECT_INTROSPECTION_INSTALL_PRE_WRAPPERS $(STAGING_DIR)/usr/bin/g-ir-scanner-qemuwrapper $(SED) "s%@QEMU_USER@%$(QEMU_USER)%g" \ $(STAGING_DIR)/usr/bin/g-ir-scanner-qemuwrapper + $(SED) "s%@QEMU_USERMODE_ARGS@%$(call qstrip,$(BR2_PACKAGE_HOST_QEMU_USER_MODE_ARGS))%g" \ + $(STAGING_DIR)/usr/bin/g-ir-scanner-qemuwrapper $(SED) "s%@TOOLCHAIN_HEADERS_VERSION@%$(BR2_TOOLCHAIN_HEADERS_AT_LEAST)%g" \ $(STAGING_DIR)/usr/bin/g-ir-scanner-qemuwrapper -- 2.30.2