diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2018-01-03 17:24:04 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-01-04 12:57:43 +0000 |
commit | 0d40074b7c29a812faaabf38d47a0ab549bd56c7 (patch) | |
tree | 952ccd7b6cccf8c89d33b472fd7321e02e76c022 /meta/recipes-gnome/gobject-introspection/gobject-introspection_1.54.1.bb | |
parent | a91b286291c7401c5788c45a68f13f690f1a6d15 (diff) | |
download | poky-0d40074b7c29a812faaabf38d47a0ab549bd56c7.tar.gz |
gobject-introspection: do not export LD_LIBRARY_PATH prior to running qemu
Latest g-i upstream adds target paths to this variable which breaks
qemu in various confusing ways.
Instead, the list of target library paths is exported to GIR_EXTRA_LIBS_PATH,
so that it can be picked up automatically by the qemu wrapper script
and given to qemu (manually setting this variable from various recipes
will be removed in a different patch).
Also, re-enable parts of g-i on mips64, as it is the same issue.
(From OE-Core rev: 58d31dddebbf7116e71bf45bd374a7a988f6016c)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/gobject-introspection/gobject-introspection_1.54.1.bb')
-rw-r--r-- | meta/recipes-gnome/gobject-introspection/gobject-introspection_1.54.1.bb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.54.1.bb b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.54.1.bb index 156dac7ca7..85c8001dea 100644 --- a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.54.1.bb +++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.54.1.bb | |||
@@ -14,6 +14,7 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/1.54/${BPN}-${PV}.tar.xz \ | |||
14 | file://0003-giscanner-add-use-binary-wrapper-option.patch \ | 14 | file://0003-giscanner-add-use-binary-wrapper-option.patch \ |
15 | file://0004-giscanner-add-a-use-ldd-wrapper-option.patch \ | 15 | file://0004-giscanner-add-a-use-ldd-wrapper-option.patch \ |
16 | file://0005-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch \ | 16 | file://0005-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch \ |
17 | file://0001-giscanner-add-a-lib-dirs-envvar-option.patch \ | ||
17 | " | 18 | " |
18 | SRC_URI[md5sum] = "126c29e4d54adbed2ed4e2b04483de41" | 19 | SRC_URI[md5sum] = "126c29e4d54adbed2ed4e2b04483de41" |
19 | SRC_URI[sha256sum] = "b88ded5e5f064ab58a93aadecd6d58db2ec9d970648534c63807d4f9a7bb877e" | 20 | SRC_URI[sha256sum] = "b88ded5e5f064ab58a93aadecd6d58db2ec9d970648534c63807d4f9a7bb877e" |
@@ -71,7 +72,7 @@ EOF | |||
71 | # This prevents g-ir-scanner from writing cache data to $HOME | 72 | # This prevents g-ir-scanner from writing cache data to $HOME |
72 | export GI_SCANNER_DISABLE_CACHE=1 | 73 | export GI_SCANNER_DISABLE_CACHE=1 |
73 | 74 | ||
74 | g-ir-scanner --use-binary-wrapper=${STAGING_BINDIR}/g-ir-scanner-qemuwrapper --use-ldd-wrapper=${STAGING_BINDIR}/g-ir-scanner-lddwrapper --add-include-path=${STAGING_DATADIR}/gir-1.0 "\$@" | 75 | g-ir-scanner --lib-dirs-envvar=GIR_EXTRA_LIBS_PATH --use-binary-wrapper=${STAGING_BINDIR}/g-ir-scanner-qemuwrapper --use-ldd-wrapper=${STAGING_BINDIR}/g-ir-scanner-lddwrapper --add-include-path=${STAGING_DATADIR}/gir-1.0 "\$@" |
75 | EOF | 76 | EOF |
76 | chmod +x ${B}/g-ir-scanner-wrapper | 77 | chmod +x ${B}/g-ir-scanner-wrapper |
77 | 78 | ||