diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2011-12-01 13:02:07 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-12-01 12:20:01 +0000 |
commit | 1c62040f894d159af750c9cb47a0b2d94c95c505 (patch) | |
tree | ec5f638bfc062709b1680e283a3db0bb4a69fc34 /meta/recipes-gnome/gnome | |
parent | aab6939cb1284c5ba291122e7b6fe881f4cdf098 (diff) | |
download | poky-1c62040f894d159af750c9cb47a0b2d94c95c505.tar.gz |
gconf: add polkit to DEPENDS only for target recipe and disable default-service for native
* gnome-common-native is needed because gnomebase.bbclass does only
DEPENDS += "gnome-common"
(From OE-Core rev: 91b94f93edbff234b70723419bf4caf13a71777b)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/gnome')
-rw-r--r-- | meta/recipes-gnome/gnome/gconf_3.2.3.bb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/meta/recipes-gnome/gnome/gconf_3.2.3.bb b/meta/recipes-gnome/gnome/gconf_3.2.3.bb index aa9da780f9..cdc7a3502d 100644 --- a/meta/recipes-gnome/gnome/gconf_3.2.3.bb +++ b/meta/recipes-gnome/gnome/gconf_3.2.3.bb | |||
@@ -3,9 +3,10 @@ SECTION = "x11/gnome" | |||
3 | LICENSE = "LGPLv2+" | 3 | LICENSE = "LGPLv2+" |
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605" | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605" |
5 | 5 | ||
6 | DEPENDS = "glib-2.0 dbus dbus-glib libxml2 intltool-native" | 6 | DEPENDS = "glib-2.0 dbus dbus-glib libxml2 intltool-native polkit" |
7 | DEPENDS_virtclass-native = "glib-2.0-native dbus-native dbus-glib-native libxml2-native intltool-native gnome-common-native" | ||
7 | 8 | ||
8 | PR = "r1" | 9 | PR = "r2" |
9 | 10 | ||
10 | inherit gnomebase | 11 | inherit gnomebase |
11 | 12 | ||
@@ -18,7 +19,10 @@ SRC_URI[archive.sha256sum] = "52008a82a847527877d9e1e549a351c86cc53cada4733b8a70 | |||
18 | 19 | ||
19 | S = "${WORKDIR}/GConf-${PV}" | 20 | S = "${WORKDIR}/GConf-${PV}" |
20 | 21 | ||
21 | EXTRA_OECONF = "--disable-gtk-doc --disable-gtk --enable-shared --disable-static --enable-debug=yes --disable-introspection --disable-orbit --with-openldap=no" | 22 | POLKIT_OECONF = "--enable-defaults-service" |
23 | POLKIT_OECONF_virtclass-native = "--disable-defaults-service" | ||
24 | EXTRA_OECONF = "--disable-gtk-doc --disable-gtk --enable-shared --disable-static --enable-debug=yes \ | ||
25 | --disable-introspection --disable-orbit --with-openldap=no ${POLKIT_OECONF}" | ||
22 | 26 | ||
23 | do_configure_prepend () { | 27 | do_configure_prepend () { |
24 | touch gtk-doc.make | 28 | touch gtk-doc.make |