[oe-commits] Chris Larson : gtk+-native: generate wrappers for relocation
git version control
git at git.openembedded.org
Sun Oct 3 05:15:19 UTC 2010
Module: openembedded.git
Branch: master
Commit: faea5a2dc9594ffecc671e923e275a403c0cbc55
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=faea5a2dc9594ffecc671e923e275a403c0cbc55
Author: Chris Larson <chris_larson at mentor.com>
Date: Fri Oct 1 09:59:43 2010 -0700
gtk+-native: generate wrappers for relocation
Generate wrapper scripts for the gdk-pixbuf tools, to ensure they are using
the correct paths into the sysroot.
Signed-off-by: Chris Larson <chris_larson at mentor.com>
---
recipes/gtk+/gtk+.inc | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/recipes/gtk+/gtk+.inc b/recipes/gtk+/gtk+.inc
index bb74d78..59b8af4 100644
--- a/recipes/gtk+/gtk+.inc
+++ b/recipes/gtk+/gtk+.inc
@@ -16,7 +16,7 @@ SRC_URI = "http://download.gnome.org/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.bz2;
file://xsettings.patch \
"
-INC_PR = "r8"
+INC_PR = "r9"
inherit autotools pkgconfig
@@ -79,8 +79,12 @@ do_install_virtclass-native () {
install -d ${D}${sysconfdir}/gtk-2.0
rm -f ${D}${libdir}/gtk-2.0/*/*.la ${D}${libdir}/gtk-2.0/${LIBV}/*/*.la
- mkdir -p "${D}${sysconfdir}/gtk-2.0"
- ${B}/gdk-pixbuf/gdk-pixbuf-query-loaders ${B}/gdk-pixbuf/.libs/*.so | sed 's:${B}/gdk-pixbuf/.libs:${STAGING_LIBDIR}/gtk-2.0/${LIBV}/loaders:' > "${D}${sysconfdir}/gtk-2.0/gdk-pixbuf.loaders"
+ create_wrapper ${D}${bindir}/gdk-pixbuf-query-loaders \
+ '"GDK_PIXBUF_MODULEDIR=${STAGING_LIBDIR}/gtk-2.0/${LIBV}/loaders"'
+ ${D}${bindir}/gdk-pixbuf-query-loaders > \
+ "${D}${sysconfdir}/gtk-2.0/gdk-pixbuf.loaders"
+ create_wrapper ${D}${bindir}/gdk-pixbuf-csource \
+ '"GDK_PIXBUF_MODULE_FILE=${D}${sysconfdir}/gtk-2.0/gdk-pixbuf.loaders"'
}
postinst_prologue() {
More information about the Openembedded-commits
mailing list