summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2019-02-23 13:42:49 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-02-25 12:35:59 +0000
commit1525641392eb818624f6e568fc6379fd07fef0c9 (patch)
tree157efc87d115afe4ea989b561c0af4a16a16fc80
parenta3ebd8a19de79c0dbd83a8430acfcffadbda48e7 (diff)
downloadpoky-1525641392eb818624f6e568fc6379fd07fef0c9.tar.gz
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 <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/gtk-doc.bbclass3
1 files changed, 3 insertions, 0 deletions
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
51GIR_EXTRA_LIBS_PATH=\`find ${B} -name *.so -printf "%h\n"|sort|uniq| tr '\n' ':'\`\$GIR_EXTRA_LIBS_PATH 51GIR_EXTRA_LIBS_PATH=\`find ${B} -name *.so -printf "%h\n"|sort|uniq| tr '\n' ':'\`\$GIR_EXTRA_LIBS_PATH
52GIR_EXTRA_LIBS_PATH=\`find ${B} -name .libs| tr '\n' ':'\`\$GIR_EXTRA_LIBS_PATH 52GIR_EXTRA_LIBS_PATH=\`find ${B} -name .libs| tr '\n' ':'\`\$GIR_EXTRA_LIBS_PATH
53 53
54# meson sets this wrongly (only to libs in build-dir), qemu-wrapper_cmdline() and GIR_EXTRA_LIBS_PATH take care of it properly
55unset LD_LIBRARY_PATH
56
54if [ -d ".libs" ]; then 57if [ -d ".libs" ]; then
55 $qemu_binary ".libs/\$@" 58 $qemu_binary ".libs/\$@"
56else 59else