From patchwork Mon Nov 14 18:54:19 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [3/4] distcc: make distccmon-gnome optional and default to off Date: Mon, 14 Nov 2011 18:54:19 -0000 From: Paul Eggleton X-Patchwork-Id: 14953 Message-Id: <2ffb85152b2b9356efeb008891d8ed29f1f35cef.1321296476.git.paul.eggleton@linux.intel.com> To: openembedded-core@lists.openembedded.org Most people building distcc will not need the distccmon-gnome GUI to be built, so make it optional via the new PACKAGECONFIG functionality and default it to disabled. (This also removes the need to disable it for uclibc.) Part of the fix for [YOCTO #1690]. Signed-off-by: Paul Eggleton --- meta/recipes-devtools/distcc/distcc_2.18.3.bb | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/meta/recipes-devtools/distcc/distcc_2.18.3.bb b/meta/recipes-devtools/distcc/distcc_2.18.3.bb index ec6ffb3..e15af5e 100644 --- a/meta/recipes-devtools/distcc/distcc_2.18.3.bb +++ b/meta/recipes-devtools/distcc/distcc_2.18.3.bb @@ -4,11 +4,12 @@ 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" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[gui] = "--with-gtk,--without-gtk --without-gnome,gtk+" RRECOMMENDS_${PN} = "avahi-daemon" @@ -28,20 +29,19 @@ 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 install -m 0755 ${WORKDIR}/distcc ${D}${sysconfdir}/init.d/ install -m 0755 ${WORKDIR}/default ${D}${sysconfdir}/default/distcc - ${DESKTOPINSTALL} + ${@base_contains("PACKAGECONFIG", "gui", "desktop_install", "", d)} } -DESKTOPINSTALL = "" -DESKTOPINSTALL_libc-glibc () { + +desktop_install() { install -d ${D}${datadir}/distcc/ install -m 0644 ${WORKDIR}/distccmon-gnome.desktop ${D}${datadir}/distcc/ } + PACKAGES += "distcc-distmon-gnome" FILES_${PN} = " ${sysconfdir} \