From 1525641392eb818624f6e568fc6379fd07fef0c9 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Sat, 23 Feb 2019 13:42:49 +0100 Subject: gtk-doc.bbclass: unset LD_LIBRARY_PATH meson has been found to set it erroneously. (From OE-Core rev: 920824125eb87928a329a072fa6c5a839efc932b) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/classes/gtk-doc.bbclass | 3 +++ 1 file changed, 3 insertions(+) (limited to 'meta/classes/gtk-doc.bbclass') diff --git a/meta/classes/gtk-doc.bbclass b/meta/classes/gtk-doc.bbclass index bedb36ec8b..707d74d108 100644 --- a/meta/classes/gtk-doc.bbclass +++ b/meta/classes/gtk-doc.bbclass @@ -51,6 +51,9 @@ export GIO_MODULE_DIR=${STAGING_LIBDIR}/gio/modules-dummy GIR_EXTRA_LIBS_PATH=\`find ${B} -name *.so -printf "%h\n"|sort|uniq| tr '\n' ':'\`\$GIR_EXTRA_LIBS_PATH GIR_EXTRA_LIBS_PATH=\`find ${B} -name .libs| tr '\n' ':'\`\$GIR_EXTRA_LIBS_PATH +# meson sets this wrongly (only to libs in build-dir), qemu-wrapper_cmdline() and GIR_EXTRA_LIBS_PATH take care of it properly +unset LD_LIBRARY_PATH + if [ -d ".libs" ]; then $qemu_binary ".libs/\$@" else -- cgit v1.2.3-54-g00ecf