From: Alexander Kanavin Date: Sat, 23 Feb 2019 12:42:49 +0000 (+0100) Subject: gtk-doc.bbclass: unset LD_LIBRARY_PATH X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~15227 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=920824125eb87928a329a072fa6c5a839efc932b;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git gtk-doc.bbclass: unset LD_LIBRARY_PATH meson has been found to set it erroneously. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- diff --git a/meta/classes/gtk-doc.bbclass b/meta/classes/gtk-doc.bbclass index bedb36ec8b7..707d74d1083 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