summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2011-05-18 19:17:40 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-23 15:35:36 +0100
commit5436acabdf61f249dc1646eaa85b2654bc627aed (patch)
treea5c7a0c7d14a545a79100ee080535489761d92bf
parentfbc0fdbbb759b37d97de6f28daf04055531fbe0b (diff)
downloadopenembedded-core-5436acabdf61f249dc1646eaa85b2654bc627aed.tar.gz
openembedded-core-5436acabdf61f249dc1646eaa85b2654bc627aed.tar.bz2
openembedded-core-5436acabdf61f249dc1646eaa85b2654bc627aed.zip
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 Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta/recipes-devtools/distcc/distcc_2.18.3.bb15
1 files changed, 11 insertions, 4 deletions
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} \