[oe-commits] Khem Raj : distcc_2.18.3.bb: Fix compilation on uclibc
git version control
git at git.openembedded.org
Mon May 23 22:01:34 UTC 2011
Module: openembedded-core.git
Branch: master
Commit: 5436acabdf61f249dc1646eaa85b2654bc627aed
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=5436acabdf61f249dc1646eaa85b2654bc627aed
Author: Khem Raj <raj.khem at gmail.com>
Date: Wed May 18 19:17:40 2011 -0700
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 at gmail.com>
---
meta/recipes-devtools/distcc/distcc_2.18.3.bb | 15 +++++++++++----
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 1f5c2af..ece1b02 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} \
More information about the Openembedded-commits
mailing list