[Buildroot] [PATCH/master 1/7] g-ir-scanner-qemuwrapper.in: Fix latent bug in

Adam Duskett aduskett at gmail.com
Fri Sep 3 16:20:21 UTC 2021


If GIR_EXTRA_LIBS_PATH is empty, the LD_LIBRARY_PATH variable is
":.libs:$(dirname $0)/../lib:$(dirname $0)/../../lib".

As discussed with Yann Morin, add a new variable, "GOI_LIBRARY_PATH" and
prepend ${GIR_EXTRA_LIBS_PATH:+${GIR_EXTRA_LIBS_PATH}:} to the path to fix the
above bug.

Signed-off-by: Adam Duskett <aduskett at gmail.com>
---
 package/gobject-introspection/g-ir-scanner-qemuwrapper.in | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/gobject-introspection/g-ir-scanner-qemuwrapper.in b/package/gobject-introspection/g-ir-scanner-qemuwrapper.in
index cad7ef875e..ec066062e2 100644
--- a/package/gobject-introspection/g-ir-scanner-qemuwrapper.in
+++ b/package/gobject-introspection/g-ir-scanner-qemuwrapper.in
@@ -4,10 +4,11 @@
 # is older than the target kernel.
 # 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"
 GIO_MODULE_DIR=$(dirname $0)/../lib/gio/modules-dummy \
 @QEMU_USER@ -r @TOOLCHAIN_HEADERS_VERSION@ \
 -L $(dirname $0)/../../ \
--E LD_LIBRARY_PATH=${GIR_EXTRA_LIBS_PATH}:.libs:$(dirname $0)/../lib:$(dirname $0)/../../lib \
+-E LD_LIBRARY_PATH="${GOI_LIBRARY_PATH}" \
 "$@"
 
 if [[ $? -ne 0 ]]; then
-- 
2.30.2



More information about the buildroot mailing list