From f855c3e6328da913360fa2e5ab5131a5b25aac2b Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Fri, 6 Apr 2012 15:59:08 -0500 Subject: distcc: use PACKAGECONFIG for x11 distro feature (From OE-Core rev: c2bebf05752ec01144e32dbf2bbe4cfa86ae67df) Signed-off-by: Christopher Larson Signed-off-by: Richard Purdie --- meta/recipes-devtools/distcc/distcc_2.18.3.bb | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'meta/recipes-devtools') diff --git a/meta/recipes-devtools/distcc/distcc_2.18.3.bb b/meta/recipes-devtools/distcc/distcc_2.18.3.bb index ec6ffb37fa..de181e5e87 100644 --- a/meta/recipes-devtools/distcc/distcc_2.18.3.bb +++ b/meta/recipes-devtools/distcc/distcc_2.18.3.bb @@ -4,11 +4,15 @@ compilation of C/C++/ObjC code across machines on a network." SECTION = "devel" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -PR = "r7" +PR = "r8" -DEPENDS = "avahi ${GTKDEP}" -GTKDEP_libc-uclibc = "" -GTKDEP = "gtk+" +DEPENDS = "avahi" + +GTKCONFIG = "gtk" +GTKCONFIG_libc-uclibc = "" + +PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', '${GTKCONFIG}', '', d)}" +PACKAGECONFIG[gtk] = "--with-gtk,--without-gtk --without-gnome,gtk+" RRECOMMENDS_${PN} = "avahi-daemon" @@ -28,8 +32,6 @@ inherit autotools pkgconfig update-rc.d INITSCRIPT_NAME = "distcc" -EXTRA_OECONF = "--with-gtk" -EXTRA_OECONF_libc-uclibc = "--without-gtk --without-gnome" do_install_append() { install -d ${D}${sysconfdir}/init.d/ install -d ${D}${sysconfdir}/default -- cgit v1.2.3-54-g00ecf