All of lore.kernel.org
 help / color / mirror / Atom feed
From: Adam Duskett <aduskett@gmail.com>
To: buildroot@buildroot.org
Cc: Romain Naour <romain.naour@gmail.com>,
	Anisse Astier <anisse@astier.eu>,
	Adam Duskett <aduskett@gmail.com>
Subject: [Buildroot] [PATCH/master 7/7] package/gobject-introspection: Add QEMU_USERMODE_ARGS support
Date: Fri,  3 Sep 2021 09:20:27 -0700	[thread overview]
Message-ID: <20210903162027.1935040-8-aduskett@gmail.com> (raw)
In-Reply-To: <20210903162027.1935040-1-aduskett@gmail.com>

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 <aduskett@gmail.com>
---
 package/gobject-introspection/g-ir-scanner-qemuwrapper.in | 2 ++
 package/gobject-introspection/gobject-introspection.mk    | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/package/gobject-introspection/g-ir-scanner-qemuwrapper.in b/package/gobject-introspection/g-ir-scanner-qemuwrapper.in
index 5ece75d0a4..e434502e2b 100644
--- a/package/gobject-introspection/g-ir-scanner-qemuwrapper.in
+++ b/package/gobject-introspection/g-ir-scanner-qemuwrapper.in
@@ -5,8 +5,10 @@
 # Use a modules directory which does not exist so we don't load random things
 # which may then get deleted (or their dependencies) and potentially segfault
 GOI_LIBRARY_PATH="${GIR_EXTRA_LIBS_PATH:+${GIR_EXTRA_LIBS_PATH}:}.libs:$(dirname "$0")/../lib:$(dirname "$0")/../../lib"
+QEMU_USERMODE_ARGS="@QEMU_USERMODE_ARGS@"
 GIO_MODULE_DIR="$(dirname "$0")/../lib/gio/modules-dummy" \
 @QEMU_USER@ -r @TOOLCHAIN_HEADERS_VERSION@ \
+    ${QEMU_USERMODE_ARGS:+${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 81938b14df..23d6a8231e 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

_______________________________________________
buildroot mailing list
buildroot@lists.buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

  parent reply	other threads:[~2021-09-03 16:22 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-03 16:20 [Buildroot] [PATCH/master 0/7] Qemu and gobject-introspection fixes Adam Duskett
2021-09-03 16:20 ` [Buildroot] [PATCH/master 1/7] g-ir-scanner-qemuwrapper.in: Fix latent bug in Adam Duskett
2021-09-03 22:27   ` Thomas Petazzoni
2021-09-11 18:55   ` Arnout Vandecappelle
2021-09-03 16:20 ` [Buildroot] [PATCH/master 2/7] g-ir-scanner-qemuwrapper.in: Fix shellcheck warnings, switch to sh Adam Duskett
2021-09-11 18:57   ` Arnout Vandecappelle
2021-09-11 19:49     ` Yann E. MORIN
2021-09-03 16:20 ` [Buildroot] [PATCH/master 3/7] g-ir-scanner.in: " Adam Duskett
2021-09-11 19:00   ` Arnout Vandecappelle
2021-09-03 16:20 ` [Buildroot] [PATCH/master 4/7] g-ir-scanner-lddwrapper.in: " Adam Duskett
2021-09-11 19:00   ` Arnout Vandecappelle
2021-09-03 16:20 ` [Buildroot] [PATCH/master 5/7] g-ir-compiler.in: " Adam Duskett
2021-09-11 19:01   ` Arnout Vandecappelle
2021-09-03 16:20 ` [Buildroot] [PATCH/master 6/7] package/qemu: add BR2_PACKAGE_HOST_QEMU_USER_MODE_ARGS string Adam Duskett
2021-09-03 22:37   ` Thomas Petazzoni
2021-09-10 17:42     ` Adam Duskett
2021-09-11 19:39       ` Arnout Vandecappelle
2021-09-11 19:42         ` Arnout Vandecappelle
2021-09-03 16:20 ` Adam Duskett [this message]
2021-09-11 19:47   ` [Buildroot] [PATCH/master 7/7] package/gobject-introspection: Add QEMU_USERMODE_ARGS support Arnout Vandecappelle
2021-09-03 22:27 ` [Buildroot] [PATCH/master 0/7] Qemu and gobject-introspection fixes Thomas Petazzoni
2021-09-03 23:09   ` Adam Duskett
2021-09-04  7:49     ` Thomas Petazzoni

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210903162027.1935040-8-aduskett@gmail.com \
    --to=aduskett@gmail.com \
    --cc=anisse@astier.eu \
    --cc=buildroot@buildroot.org \
    --cc=romain.naour@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.