diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-12-13 17:08:42 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-12-13 18:00:18 +0000 |
| commit | b9dfccc018f32a47fc045f35d5f53d7269d791ed (patch) | |
| tree | 89fb731bfcf14590d81e6b4a8f22cadef823dab9 | |
| parent | 86a815fe1b2e447e264cb40f6f65e3343d6b6188 (diff) | |
| download | openembedded-core-b9dfccc018f32a47fc045f35d5f53d7269d791ed.tar.gz openembedded-core-b9dfccc018f32a47fc045f35d5f53d7269d791ed.tar.bz2 openembedded-core-b9dfccc018f32a47fc045f35d5f53d7269d791ed.tar.xz openembedded-core-b9dfccc018f32a47fc045f35d5f53d7269d791ed.zip | |
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.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.0.bb | 12 |
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 b33eca968..e71c44831 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-${ SRC_URI[md5sum] = "d8ece3a4ade4a91c768328620e473ab8" SRC_URI[sha256sum] = "38d2630314e6d91976bffd833236f84fefa440a9038f86dc422820a39f2e3700" +PR = "r2" + inherit autotools pkgconfig gettext LIBV = "2.10.0" @@ -65,8 +67,14 @@ python populate_packages_prepend () { do_install_append_virtclass-native() { #Use wrapper script rather than binary as required libtool library is not installed now - 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 - sed -i -e 's#${D}##g' ${D}${libdir}/gdk-pixbuf-2.0/2.10.0/loaders.cache + 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 + sed -i -e 's#${D}##g' ${D}${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders.cache find ${D}${libdir} -name "libpixbufloader-*.la" -exec rm \{\} \; + + create_wrapper ${D}/${bindir}/gdk-pixbuf-csource \ + GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders.cache + + create_wrapper ${D}/${bindir}/gdk-pixbuf-query-loaders \ + GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders.cache } BBCLASSEXTEND = "native" |