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-26 17:57:43 +0100 |
| commit | 69df75f268e2b3d5874f05e2b5a6125f6d990a03 (patch) | |
| tree | 4b354d44cd0d10554ff8210b79c4c3bb39b64a5e /meta/recipes-gnome/gdk-pixbuf | |
| parent | ac445614f0fec7537b3870581339f7d04db39fa9 (diff) | |
| download | openembedded-core-69df75f268e2b3d5874f05e2b5a6125f6d990a03.tar.gz openembedded-core-69df75f268e2b3d5874f05e2b5a6125f6d990a03.tar.bz2 openembedded-core-69df75f268e2b3d5874f05e2b5a6125f6d990a03.zip | |
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.
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/gdk-pixbuf')
| -rw-r--r-- | meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.8.bb | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.8.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.8.bb index 87f5038f03..2f0ca49b35 100644 --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.8.bb +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.8.bb @@ -49,7 +49,7 @@ PACKAGES =+ "${PN}-xlib" FILES_${PN}-xlib = "${libdir}/*pixbuf_xlib*${SOLIBS}" ALLOW_EMPTY_${PN}-xlib = "1" -FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \ +FILES_${PN} = "${libdir}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders \ ${libdir}/lib*.so.*" FILES_${PN}-dev += " \ @@ -61,6 +61,7 @@ FILES_${PN}-dev += " \ FILES_${PN}-dbg += " \ ${libdir}/.debug/* \ + ${libdir}/gdk-pixbuf-2.0/.debug/* \ ${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders/.debug/* \ " @@ -80,6 +81,12 @@ python populate_packages_prepend () { d.appendVar("RDEPENDS_gdk-pixbuf-ptest", " " + packages) } +do_install_append() { + # Move gdk-pixbuf-query-loaders into libdir so it is always available + # in multilib builds. + mv ${D}/${bindir}/gdk-pixbuf-query-loaders ${D}/${libdir}/gdk-pixbuf-2.0/ +} + do_install_append_class-native() { find ${D}${libdir} -name "libpixbufloader-*.la" -exec rm \{\} \; @@ -89,7 +96,7 @@ do_install_append_class-native() { create_wrapper ${D}/${bindir}/gdk-pixbuf-pixdata \ GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders.cache - create_wrapper ${D}/${bindir}/gdk-pixbuf-query-loaders \ + create_wrapper ${D}/${libdir}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders \ GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders.cache \ GDK_PIXBUF_MODULEDIR=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders } |