diff options
author | Ross Burton <ross.burton@intel.com> | 2015-09-25 23:25:12 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-28 12:00:16 +0100 |
commit | 8a12632e975d0efe71346b56202d19fe3f83ff08 (patch) | |
tree | b00e5069620422f28dd563e53264c7b29bd0fafc /scripts/postinst-intercepts/update_pixbuf_cache | |
parent | b0707780fb4eb3a11c00e8d112d44b750e6d522c (diff) | |
download | poky-8a12632e975d0efe71346b56202d19fe3f83ff08.tar.gz |
gdk-pixbuf: move gdk-pixbuf-query-loaders to $libdir for multilib safety
If for example gdk-pixbuf and lib32-gdk-pixbuf are in an image then only one
${bindir}/gdk-pixbuf-query-loaders will be installed, so only one variant will
actually be usable.
Solve this by moving gdk-pixbuf-query-loaders into ${libdir} as it's intimately
tied to the library and rarely directly invoked by the user, and update the
callers to use the right path.
(From OE-Core rev: 69df75f268e2b3d5874f05e2b5a6125f6d990a03)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/postinst-intercepts/update_pixbuf_cache')
-rw-r--r-- | scripts/postinst-intercepts/update_pixbuf_cache | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/scripts/postinst-intercepts/update_pixbuf_cache b/scripts/postinst-intercepts/update_pixbuf_cache index 95bf4f90a3..a8b4001069 100644 --- a/scripts/postinst-intercepts/update_pixbuf_cache +++ b/scripts/postinst-intercepts/update_pixbuf_cache | |||
@@ -4,8 +4,6 @@ export GDK_PIXBUF_MODULEDIR=$D${libdir}/gdk-pixbuf-2.0/2.10.0/loaders | |||
4 | export GDK_PIXBUF_FATAL_LOADER=1 | 4 | export GDK_PIXBUF_FATAL_LOADER=1 |
5 | 5 | ||
6 | PSEUDO_UNLOAD=1 qemuwrapper -L $D -E LD_LIBRARY_PATH=$D/${libdir}:$D/${base_libdir}\ | 6 | PSEUDO_UNLOAD=1 qemuwrapper -L $D -E LD_LIBRARY_PATH=$D/${libdir}:$D/${base_libdir}\ |
7 | $D${bindir}/gdk-pixbuf-query-loaders \ | 7 | $D${libdir}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders \ |
8 | >$GDK_PIXBUF_MODULEDIR/../loaders.cache && \ | 8 | >$GDK_PIXBUF_MODULEDIR/../loaders.cache && \ |
9 | sed -i -e "s:$D::g" $GDK_PIXBUF_MODULEDIR/../loaders.cache | 9 | sed -i -e "s:$D::g" $GDK_PIXBUF_MODULEDIR/../loaders.cache |
10 | |||
11 | |||