From e2648e26c98fed8a6b3ecc9851d2cb03b09e7b85 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 18 May 2011 19:17:40 -0700 Subject: distcc_2.18.3.bb: Fix compilation on uclibc We enable gtk/gnome in distcc that code uses loadavg() a function unimplemented in uclibc. Therefore for uclibc we disable gnome and gtk+ features in distcc (From OE-Core rev: 5436acabdf61f249dc1646eaa85b2654bc627aed) Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-devtools/distcc/distcc_2.18.3.bb | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'meta/recipes-devtools/distcc') diff --git a/meta/recipes-devtools/distcc/distcc_2.18.3.bb b/meta/recipes-devtools/distcc/distcc_2.18.3.bb index 1f5c2af107..ece1b02105 100644 --- a/meta/recipes-devtools/distcc/distcc_2.18.3.bb +++ b/meta/recipes-devtools/distcc/distcc_2.18.3.bb @@ -6,7 +6,10 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" PR = "r6" -DEPENDS = "avahi gtk+" +DEPENDS = "avahi ${GTKDEP}" +GTKDEP_libc-uclibc = "" +GTKDEP = "gtk+" + RRECOMMENDS_${PN} = "avahi-daemon" # Upstream change this patch periodically so store locally @@ -24,16 +27,20 @@ inherit autotools pkgconfig update-rc.d INITSCRIPT_NAME = "distcc" -EXTRA_OECONF = " --with-gtk " - +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} +} +DESKTOPINSTALL = "" +DESKTOPINSTALL_libc-glibc () { + install -d ${D}${datadir}/distcc/ install -m 0644 ${WORKDIR}/distccmon-gnome.desktop ${D}${datadir}/distcc/ } - PACKAGES += "distcc-distmon-gnome" FILES_${PN} = " ${sysconfdir} \ -- cgit v1.2.3-54-g00ecf