summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-12-13 17:08:42 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-12-13 18:00:25 (GMT)
commit9d136b2db8f906c562cbdb23a9b238f0e237074b (patch)
treefa690c31444dadde6b9be6be5db576eaaa33d0ff /meta/recipes-gnome
parentbf2ab7ed63f0f9ee26f368b6fc31093ffa5a2a17 (diff)
downloadpoky-9d136b2db8f906c562cbdb23a9b238f0e237074b.tar.gz
gdk-pixbuf: Ensure the binaries can be relocated
There are paths hardcoded into the binaries provided by this recipe. This patch adds the neccessary environment options to ensure they can be relocated successfully avoding build failures. (From OE-Core rev: b9dfccc018f32a47fc045f35d5f53d7269d791ed) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome')
-rw-r--r--meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.0.bb12
1 files changed, 10 insertions, 2 deletions
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.0.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.0.bb
index b33eca9..e71c448 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.0.bb
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.0.bb
@@ -18,6 +18,8 @@ SRC_URI = "http://ftp.acc.umu.se/pub/GNOME/sources/gdk-pixbuf/2.24/gdk-pixbuf-${
18SRC_URI[md5sum] = "d8ece3a4ade4a91c768328620e473ab8" 18SRC_URI[md5sum] = "d8ece3a4ade4a91c768328620e473ab8"
19SRC_URI[sha256sum] = "38d2630314e6d91976bffd833236f84fefa440a9038f86dc422820a39f2e3700" 19SRC_URI[sha256sum] = "38d2630314e6d91976bffd833236f84fefa440a9038f86dc422820a39f2e3700"
20 20
21PR = "r2"
22
21inherit autotools pkgconfig gettext 23inherit autotools pkgconfig gettext
22 24
23LIBV = "2.10.0" 25LIBV = "2.10.0"
@@ -65,8 +67,14 @@ python populate_packages_prepend () {
65 67
66do_install_append_virtclass-native() { 68do_install_append_virtclass-native() {
67#Use wrapper script rather than binary as required libtool library is not installed now 69#Use wrapper script rather than binary as required libtool library is not installed now
68 GDK_PIXBUF_MODULEDIR=${D}${libdir}/gdk-pixbuf-2.0/2.10.0/loaders ${S}/gdk-pixbuf/gdk-pixbuf-query-loaders > ${D}${libdir}/gdk-pixbuf-2.0/2.10.0/loaders.cache 70 GDK_PIXBUF_MODULEDIR=${D}${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders ${S}/gdk-pixbuf/gdk-pixbuf-query-loaders > ${D}${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders.cache
69 sed -i -e 's#${D}##g' ${D}${libdir}/gdk-pixbuf-2.0/2.10.0/loaders.cache 71 sed -i -e 's#${D}##g' ${D}${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders.cache
70 find ${D}${libdir} -name "libpixbufloader-*.la" -exec rm \{\} \; 72 find ${D}${libdir} -name "libpixbufloader-*.la" -exec rm \{\} \;
73
74 create_wrapper ${D}/${bindir}/gdk-pixbuf-csource \
75 GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders.cache
76
77 create_wrapper ${D}/${bindir}/gdk-pixbuf-query-loaders \
78 GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders.cache
71} 79}
72BBCLASSEXTEND = "native" 80BBCLASSEXTEND = "native"