package/gobject-introspection/g-ir-scanner-qemuwrapper.in: Fix latent bug if GIR_EXTRA_LIBS_PATH is empty

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@gmail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
This commit is contained in:
Adam Duskett 2021-09-03 09:20:21 -07:00 committed by Arnout Vandecappelle (Essensium/Mind)
parent ecd20b1633
commit 97ab9ffa73

View File

@ -1,5 +1,7 @@
#!/usr/bin/env bash
GOI_LIBRARY_PATH="${GIR_EXTRA_LIBS_PATH:+${GIR_EXTRA_LIBS_PATH}:}.libs:$(dirname "$0")/../lib:$(dirname "$0")/../../lib"
# Pass -r to qemu-user as to trick glibc into not errorings out if the host kernel
# is older than the target kernel.
# Use a modules directory which does not exist so we don't load random things
@ -7,7 +9,7 @@
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