summaryrefslogtreecommitdiffstats
path: root/meta/classes/fontcache.bbclass
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2018-06-11 16:38:20 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-06-18 11:07:58 +0100
commit87631af64032b18ea354b27cc586ec13391bd143 (patch)
tree18747d896b9853e44fb7039921adc66c0ee3518e /meta/classes/fontcache.bbclass
parente67551e80e100913f59f3f9c8071ca451be02289 (diff)
downloadpoky-87631af64032b18ea354b27cc586ec13391bd143.tar.gz
qemuwrapper-cross: enable multilib and nativesdk variants of the script
Previously only one global variant of the script was created, which caused numerous issues: 1) multilib was not properly supported due to multilib variants each needing their own version of the qemu binary and library paths to be set 2) nativesdk was not properly supported for the same reason This patch also moves setting LD_LIBRARY_PATH directly into the recipe, as passing it down from other recipes did not work when said recipes were allarch, and adjusts calls to qemuwrapper from postinst-intercepts, so that its correct variant is selected. Also, the various qemu fallbacks in qemuwrapper script are all removed, as they are no longer necessary. (From OE-Core rev: d10fd6ae3fe46290c6e3a5250878966d9f12ca3f) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/fontcache.bbclass')
-rw-r--r--meta/classes/fontcache.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/fontcache.bbclass b/meta/classes/fontcache.bbclass
index e76331131e..f71a754a4d 100644
--- a/meta/classes/fontcache.bbclass
+++ b/meta/classes/fontcache.bbclass
@@ -17,7 +17,7 @@ FONTCONFIG_CACHE_PARAMS ?= "-v"
17FONTCONFIG_CACHE_ENV ?= "FC_DEBUG=1" 17FONTCONFIG_CACHE_ENV ?= "FC_DEBUG=1"
18fontcache_common() { 18fontcache_common() {
19if [ -n "$D" ] ; then 19if [ -n "$D" ] ; then
20 $INTERCEPT_DIR/postinst_intercept update_font_cache ${PKG} mlprefix=${MLPREFIX} \ 20 $INTERCEPT_DIR/postinst_intercept update_font_cache ${PKG} mlprefix=${MLPREFIX} binprefix=${MLPREFIX} \
21 'bindir="${bindir}"' \ 21 'bindir="${bindir}"' \
22 'libdir="${libdir}"' \ 22 'libdir="${libdir}"' \
23 'base_libdir="${base_libdir}"' \ 23 'base_libdir="${base_libdir}"' \