summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome
diff options
context:
space:
mode:
authorLaurentiu Palcu <laurentiu.palcu@intel.com>2012-12-17 14:32:42 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-19 17:54:55 +0000
commit359eb5194c7023570477e71d2f576a0611fb539f (patch)
tree67e081a651d69b91ad2e2a568f3525185f1a1b88 /meta/recipes-gnome
parent4606a8b1fb2c6c0f1e901b8069301c0264f57eee (diff)
downloadpoky-359eb5194c7023570477e71d2f576a0611fb539f.tar.gz
gconf: add gconftool-2 native wrapper
This is needed when sstate cache is fetched from another build server. In this case, the postinstall will fail because the backend libraries path will be from the build server. (From OE-Core rev: bba414bc9d14eb2d29b54c68259d13ddbe6567fa) Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome')
-rw-r--r--meta/recipes-gnome/gnome/gconf_3.2.3.bb7
1 files changed, 6 insertions, 1 deletions
diff --git a/meta/recipes-gnome/gnome/gconf_3.2.3.bb b/meta/recipes-gnome/gnome/gconf_3.2.3.bb
index f80c9104ed..ef21624de1 100644
--- a/meta/recipes-gnome/gnome/gconf_3.2.3.bb
+++ b/meta/recipes-gnome/gnome/gconf_3.2.3.bb
@@ -9,7 +9,7 @@ POLKIT_libc-uclibc = ""
9DEPENDS = "glib-2.0 dbus dbus-glib libxml2 intltool-native ${POLKIT} gobject-introspection-stub" 9DEPENDS = "glib-2.0 dbus dbus-glib libxml2 intltool-native ${POLKIT} gobject-introspection-stub"
10DEPENDS_class-native = "glib-2.0-native dbus-native dbus-glib-native libxml2-native intltool-native gnome-common-native gobject-introspection-stub-native" 10DEPENDS_class-native = "glib-2.0-native dbus-native dbus-glib-native libxml2-native intltool-native gnome-common-native gobject-introspection-stub-native"
11 11
12PR = "r12" 12PR = "r13"
13 13
14inherit gnomebase gtk-doc 14inherit gnomebase gtk-doc
15 15
@@ -37,6 +37,11 @@ do_install_append() {
37 rm -f ${D}${libdir}/gio/*/*.*a 37 rm -f ${D}${libdir}/gio/*/*.*a
38} 38}
39 39
40do_install_append_class-native() {
41 create_wrapper ${D}/${bindir}/gconftool-2 \
42 GCONF_BACKEND_DIR=${STAGING_LIBDIR_NATIVE}/GConf/2
43}
44
40# disable dbus-x11 when x11 isn't in DISTRO_FEATURES 45# disable dbus-x11 when x11 isn't in DISTRO_FEATURES
41RDEPENDS_${PN} += "${@base_contains('DISTRO_FEATURES', 'x11', 'dbus-x11', '', d)}" 46RDEPENDS_${PN} += "${@base_contains('DISTRO_FEATURES', 'x11', 'dbus-x11', '', d)}"
42RDEPENDS_${PN}_class-native = "" 47RDEPENDS_${PN}_class-native = ""