diff options
author | Khem Raj <raj.khem@gmail.com> | 2011-05-18 19:17:40 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-05-23 15:36:33 +0100 |
commit | e2648e26c98fed8a6b3ecc9851d2cb03b09e7b85 (patch) | |
tree | 1b05bba78676216306c4850c1169b5fc85fc8dbd /meta | |
parent | bd47ca475344a78e601c9de41b9f829b30e09d01 (diff) | |
download | poky-e2648e26c98fed8a6b3ecc9851d2cb03b09e7b85.tar.gz |
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 <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | 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 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" | |||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" |
7 | PR = "r6" | 7 | PR = "r6" |
8 | 8 | ||
9 | DEPENDS = "avahi gtk+" | 9 | DEPENDS = "avahi ${GTKDEP}" |
10 | GTKDEP_libc-uclibc = "" | ||
11 | GTKDEP = "gtk+" | ||
12 | |||
10 | RRECOMMENDS_${PN} = "avahi-daemon" | 13 | RRECOMMENDS_${PN} = "avahi-daemon" |
11 | 14 | ||
12 | # Upstream change this patch periodically so store locally | 15 | # Upstream change this patch periodically so store locally |
@@ -24,16 +27,20 @@ inherit autotools pkgconfig update-rc.d | |||
24 | 27 | ||
25 | INITSCRIPT_NAME = "distcc" | 28 | INITSCRIPT_NAME = "distcc" |
26 | 29 | ||
27 | EXTRA_OECONF = " --with-gtk " | 30 | EXTRA_OECONF = "--with-gtk" |
28 | 31 | EXTRA_OECONF_libc-uclibc = "--without-gtk --without-gnome" | |
29 | do_install_append() { | 32 | do_install_append() { |
30 | install -d ${D}${sysconfdir}/init.d/ | 33 | install -d ${D}${sysconfdir}/init.d/ |
31 | install -d ${D}${sysconfdir}/default | 34 | install -d ${D}${sysconfdir}/default |
32 | install -m 0755 ${WORKDIR}/distcc ${D}${sysconfdir}/init.d/ | 35 | install -m 0755 ${WORKDIR}/distcc ${D}${sysconfdir}/init.d/ |
33 | install -m 0755 ${WORKDIR}/default ${D}${sysconfdir}/default/distcc | 36 | install -m 0755 ${WORKDIR}/default ${D}${sysconfdir}/default/distcc |
37 | ${DESKTOPINSTALL} | ||
38 | } | ||
39 | DESKTOPINSTALL = "" | ||
40 | DESKTOPINSTALL_libc-glibc () { | ||
41 | install -d ${D}${datadir}/distcc/ | ||
34 | install -m 0644 ${WORKDIR}/distccmon-gnome.desktop ${D}${datadir}/distcc/ | 42 | install -m 0644 ${WORKDIR}/distccmon-gnome.desktop ${D}${datadir}/distcc/ |
35 | } | 43 | } |
36 | |||
37 | PACKAGES += "distcc-distmon-gnome" | 44 | PACKAGES += "distcc-distmon-gnome" |
38 | 45 | ||
39 | FILES_${PN} = " ${sysconfdir} \ | 46 | FILES_${PN} = " ${sysconfdir} \ |