diff options
| author | Khem Raj <raj.khem@gmail.com> | 2012-01-27 13:27:56 -0800 |
|---|---|---|
| committer | Saul Wold <sgw@linux.intel.com> | 2012-02-07 14:37:15 -0800 |
| commit | 7eae02f47a08587cf5be3d39df0184cf346cbaea (patch) | |
| tree | 11392b7a0033443f8067726a79942c60eb561f3d | |
| parent | cfd84a05581e068d705b0804829c4833a06bffa6 (diff) | |
| download | openembedded-core-7eae02f47a08587cf5be3d39df0184cf346cbaea.tar.gz openembedded-core-7eae02f47a08587cf5be3d39df0184cf346cbaea.tar.bz2 openembedded-core-7eae02f47a08587cf5be3d39df0184cf346cbaea.zip | |
gconf,consolekit: Avoid polkit when compiling with uclibc
polkit uses netdb functionality from glibc which is not
available in uclibc therefore we avoid polkit when compiling
for uclibc systems.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta/recipes-gnome/gnome/gconf_3.2.3.bb | 9 | ||||
| -rw-r--r-- | meta/recipes-support/consolekit/consolekit_0.4.5.bb | 11 |
2 files changed, 15 insertions, 5 deletions
diff --git a/meta/recipes-gnome/gnome/gconf_3.2.3.bb b/meta/recipes-gnome/gnome/gconf_3.2.3.bb index 412f01c86f..a0b8d0c632 100644 --- a/meta/recipes-gnome/gnome/gconf_3.2.3.bb +++ b/meta/recipes-gnome/gnome/gconf_3.2.3.bb @@ -3,10 +3,13 @@ SECTION = "x11/gnome" LICENSE = "LGPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605" -DEPENDS = "glib-2.0 gtk+ dbus dbus-glib libxml2 intltool-native polkit" +POLKIT = "polkit" +POLKIT_libc-uclibc = "" + +DEPENDS = "glib-2.0 gtk+ dbus dbus-glib libxml2 intltool-native ${POLKIT}" DEPENDS_virtclass-native = "glib-2.0-native dbus-native dbus-glib-native libxml2-native intltool-native gnome-common-native" -PR = "r5" +PR = "r6" inherit gnomebase @@ -21,6 +24,8 @@ S = "${WORKDIR}/GConf-${PV}" POLKIT_OECONF = "--enable-defaults-service" POLKIT_OECONF_virtclass-native = "--disable-defaults-service" +POLKIT_OECONF_libc-uclibc = "--disable-default-service" + GTKOECONF = "--with-gtk=2.0 --enable-gtk" GTKOECONF_virtclass-native = "--disable-gtk" EXTRA_OECONF = "--disable-gtk-doc --enable-shared --disable-static --enable-debug=yes \ diff --git a/meta/recipes-support/consolekit/consolekit_0.4.5.bb b/meta/recipes-support/consolekit/consolekit_0.4.5.bb index 45f6ad35a9..3ded6df7c8 100644 --- a/meta/recipes-support/consolekit/consolekit_0.4.5.bb +++ b/meta/recipes-support/consolekit/consolekit_0.4.5.bb @@ -2,13 +2,18 @@ DESCRIPTION = "ConsoleKit is a framework for defining and tracking users, login HOMEPAGE="http://www.freedesktop.org/wiki/Software/ConsoleKit" BUGTRACKER="https://bugs.freedesktop.org/buglist.cgi?query_format=specific&product=ConsoleKit" -PR = "r7" +PR = "r8" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ file://src/main.c;endline=21;md5=0a994e09769780220163255d8f9071c3" -DEPENDS = "glib-2.0 dbus polkit ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" +POLKIT = "polkit" +POLKIT_libc-uclibc = "" +POLKITCONF = "" +POLKITCONF_libc-uclibc = "--disable-policykit" + +DEPENDS = "glib-2.0 dbus ${POLKIT} ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" RDEPENDS_${PN} += "base-files" inherit gnome @@ -20,7 +25,7 @@ SRC_URI[sha256sum] = "43e0780c53078e125efcec3f847e484dc3533e49b408ce6a0ab1b22368 S = "${WORKDIR}/ConsoleKit-${PV}" -EXTRA_OECONF = "--with-systemdsystemunitdir=${base_libdir}/systemd/system/ \ +EXTRA_OECONF = "${POLKITCONF} --with-systemdsystemunitdir=${base_libdir}/systemd/system/ \ ${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam-module --with-pam-module-dir=${base_libdir}/security', '--disable-pam-module', d)} \ " |