Skip to contentSkip to conversation

gobject-introspection: unset LD_LIBRARY_PATH prior to running qemu

PATCH In review Alexander Kanavin 1 participant 2 messages Jan 2, 2018 – Jan 3, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 gobject-introspection: unset LD_LIBRARY_PATH prior to running qemu

Latest g-i upstream adds target paths to this variable which breaks qemu in various confusing ways.

Also, re-enable parts of g-i on mips64, as it is the same issue.

---
 .../gobject-introspection/gobject-introspection_1.54.1.bb             | 3 +++
 meta/recipes-graphics/clutter/clutter-gst-3.0.inc                     | 4 ----
 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc            | 3 ---
 meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server.inc        | 2 --
 4 files changed, 3 insertions(+), 9 deletions(-)
meta/recipes-gnome/gobject-introspection/gobject-introspection_1.54.1.bb +3 -0
index 156dac7ca78..ef1d561bbf8 100644
@@ -52,6 +52,9 @@ do_configure_prepend_class-target() {
 # Use a modules directory which doesn't exist so we don't load random things
 # which may then get deleted (or their dependencies) and potentially segfault
 export GIO_MODULE_DIR=${STAGING_LIBDIR}/gio/modules-dummy
+# g-ir-scanner (which executes this script) adds some target library paths to LD_LIBRARY_PATH
+# which fails horribly when running native qemu
+unset LD_LIBRARY_PATH
 
 $qemu_binary "\$@"
 if [ \$? -ne 0 ]; then
meta/recipes-graphics/clutter/clutter-gst-3.0.inc +0 -4
index 26ae91c4847..4c877982b74 100644
@@ -15,7 +15,3 @@ PACKAGES  =+ "${PN}-examples"
 FILES_${PN}          += "${libdir}/gstreamer-1.0/lib*.so"
 FILES_${PN}-dev      += "${libdir}/gstreamer-1.0/*.la"
 FILES_${PN}-examples  = "${bindir}/video-player ${bindir}/video-sink"
-
-# Needs to be disable due to a dependency on gstreamer-plugins introspection files
-EXTRA_OECONF_append_mips64 = " --disable-introspection "
-
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc +0 -3
index c40d3989119..3f6d4c37038 100644
@@ -49,6 +49,3 @@ patch_gtk_doc_makefiles() {
 do_configure[prefuncs] += " delete_pkg_m4_file patch_gtk_doc_makefiles"
 
 PACKAGES_DYNAMIC = "^${PN}-.*"
-
-# qemu-mips64: error while loading shared libraries: .../recipe-sysroot/usr/lib/libgthread-2.0.so.0: ELF file data encoding not little-endian
-EXTRA_OECONF_append_mips64 = " --disable-introspection "
meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server.inc +0 -2
index 68173ce7d94..7191f9892d7 100644
@@ -36,5 +36,3 @@ patch_gtk_doc_makefiles() {
 
 do_configure[prefuncs] += " delete_pkg_m4_file patch_gtk_doc_makefiles"
 
-# Needs to be disable due to a dependency on gstreamer-plugins introspection files
-EXTRA_OECONF_append_mips64 = " --disable-introspection "
Signature · 1 line
2.15.1
#1 lore raw
Quoted 4 lines · Alexander Kanavin

Latest g-i upstream adds target paths to this variable which breaks qemu in various confusing ways.

Also, re-enable parts of g-i on mips64, as it is the same issue.

Please discard this patch; the shell binary that runs the script that executes qemu is susceptible to the same issue and so the varibable needs to be unset even earlier. I'll send a better fix today.

Alex