summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome/gdk-pixbuf
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2015-09-25 23:25:12 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-28 12:00:16 +0100
commit8a12632e975d0efe71346b56202d19fe3f83ff08 (patch)
treeb00e5069620422f28dd563e53264c7b29bd0fafc /meta/recipes-gnome/gdk-pixbuf
parentb0707780fb4eb3a11c00e8d112d44b750e6d522c (diff)
downloadpoky-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 'meta/recipes-gnome/gdk-pixbuf')
-rw-r--r--meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.8.bb11
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"
49FILES_${PN}-xlib = "${libdir}/*pixbuf_xlib*${SOLIBS}" 49FILES_${PN}-xlib = "${libdir}/*pixbuf_xlib*${SOLIBS}"
50ALLOW_EMPTY_${PN}-xlib = "1" 50ALLOW_EMPTY_${PN}-xlib = "1"
51 51
52FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \ 52FILES_${PN} = "${libdir}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders \
53 ${libdir}/lib*.so.*" 53 ${libdir}/lib*.so.*"
54 54
55FILES_${PN}-dev += " \ 55FILES_${PN}-dev += " \
@@ -61,6 +61,7 @@ FILES_${PN}-dev += " \
61 61
62FILES_${PN}-dbg += " \ 62FILES_${PN}-dbg += " \
63 ${libdir}/.debug/* \ 63 ${libdir}/.debug/* \
64 ${libdir}/gdk-pixbuf-2.0/.debug/* \
64 ${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders/.debug/* \ 65 ${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders/.debug/* \
65" 66"
66 67
@@ -80,6 +81,12 @@ python populate_packages_prepend () {
80 d.appendVar("RDEPENDS_gdk-pixbuf-ptest", " " + packages) 81 d.appendVar("RDEPENDS_gdk-pixbuf-ptest", " " + packages)
81} 82}
82 83
84do_install_append() {
85 # Move gdk-pixbuf-query-loaders into libdir so it is always available
86 # in multilib builds.
87 mv ${D}/${bindir}/gdk-pixbuf-query-loaders ${D}/${libdir}/gdk-pixbuf-2.0/
88}
89
83do_install_append_class-native() { 90do_install_append_class-native() {
84 find ${D}${libdir} -name "libpixbufloader-*.la" -exec rm \{\} \; 91 find ${D}${libdir} -name "libpixbufloader-*.la" -exec rm \{\} \;
85 92
@@ -89,7 +96,7 @@ do_install_append_class-native() {
89 create_wrapper ${D}/${bindir}/gdk-pixbuf-pixdata \ 96 create_wrapper ${D}/${bindir}/gdk-pixbuf-pixdata \
90 GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders.cache 97 GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders.cache
91 98
92 create_wrapper ${D}/${bindir}/gdk-pixbuf-query-loaders \ 99 create_wrapper ${D}/${libdir}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders \
93 GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders.cache \ 100 GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders.cache \
94 GDK_PIXBUF_MODULEDIR=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders 101 GDK_PIXBUF_MODULEDIR=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders
95} 102}