summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2018-05-09 14:46:44 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-05-15 10:56:50 +0100
commit6c2ae5900dcd71a9a7840f661a16bcbd4af02c53 (patch)
treeb61438e4f5a7d6bb56be84642dd86dd9b67f83e6 /meta
parent26cc941cb4c29b919ed455e4a14e86b424f5f4ec (diff)
downloadpoky-6c2ae5900dcd71a9a7840f661a16bcbd4af02c53.tar.gz
distcc: move ASNEEDED over-ride into the distcc recipe
Move the recipe specific over-ride for ASNEEDED into the recipe to make it more apparent that the over-ride is being applied (and that it should be re-checked on version updates, etc). Also misc minor recipe cleanup (re-order variables to follow the OE style guide, etc). (From OE-Core rev: 5e7d337fd538325e5f69de5b409eb8e36bb5e007) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/distro/include/as-needed.inc1
-rw-r--r--meta/recipes-devtools/distcc/distcc_3.2.bb29
2 files changed, 20 insertions, 10 deletions
diff --git a/meta/conf/distro/include/as-needed.inc b/meta/conf/distro/include/as-needed.inc
index 91c0762727..94f5b90593 100644
--- a/meta/conf/distro/include/as-needed.inc
+++ b/meta/conf/distro/include/as-needed.inc
@@ -1,7 +1,6 @@
1 1
2ASNEEDED = "-Wl,--as-needed" 2ASNEEDED = "-Wl,--as-needed"
3 3
4ASNEEDED_pn-distcc = ""
5ASNEEDED_pn-openobex = "" 4ASNEEDED_pn-openobex = ""
6ASNEEDED_pn-icu = "" 5ASNEEDED_pn-icu = ""
7ASNEEDED_pn-pciutils = "" 6ASNEEDED_pn-pciutils = ""
diff --git a/meta/recipes-devtools/distcc/distcc_3.2.bb b/meta/recipes-devtools/distcc/distcc_3.2.bb
index 66046480b9..ee077495d5 100644
--- a/meta/recipes-devtools/distcc/distcc_3.2.bb
+++ b/meta/recipes-devtools/distcc/distcc_3.2.bb
@@ -7,13 +7,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
7 7
8DEPENDS = "avahi binutils" 8DEPENDS = "avahi binutils"
9 9
10PACKAGECONFIG ??= "popt"
11PACKAGECONFIG[gtk] = "--with-gtk,--without-gtk --without-gnome,gtk+"
12# use system popt by default
13PACKAGECONFIG[popt] = "--without-included-popt,--with-included-popt,popt"
14
15RRECOMMENDS_${PN} = "avahi-daemon"
16
17SRC_URI = "git://github.com/akuster/distcc.git;branch=${PV} \ 10SRC_URI = "git://github.com/akuster/distcc.git;branch=${PV} \
18 file://separatebuilddir.patch \ 11 file://separatebuilddir.patch \
19 file://0001-zeroconf-Include-fcntl.h.patch \ 12 file://0001-zeroconf-Include-fcntl.h.patch \
@@ -21,12 +14,26 @@ SRC_URI = "git://github.com/akuster/distcc.git;branch=${PV} \
21 file://distccmon-gnome.desktop \ 14 file://distccmon-gnome.desktop \
22 file://distcc \ 15 file://distcc \
23 file://distcc.service" 16 file://distcc.service"
17
24SRCREV = "d8b18df3e9dcbe4f092bed565835d3975e99432c" 18SRCREV = "d8b18df3e9dcbe4f092bed565835d3975e99432c"
19
25S = "${WORKDIR}/git" 20S = "${WORKDIR}/git"
26 21
27inherit autotools pkgconfig update-rc.d useradd systemd 22inherit autotools pkgconfig update-rc.d useradd systemd
28 23
29EXTRA_OECONF += "--disable-Werror PYTHON='' --disable-pump-mode" 24PACKAGECONFIG ??= "popt"
25
26PACKAGECONFIG[gtk] = "--with-gtk,--without-gtk --without-gnome,gtk+"
27# use system popt by default
28PACKAGECONFIG[popt] = "--without-included-popt,--with-included-popt,popt"
29
30EXTRA_OECONF += " \
31 --disable-pump-mode \
32 --disable-Werror \
33 PYTHON='' \
34"
35
36ASNEEDED = ""
30 37
31USERADD_PACKAGES = "${PN}" 38USERADD_PACKAGES = "${PN}"
32USERADD_PARAM_${PN} = "--system \ 39USERADD_PARAM_${PN} = "--system \
@@ -52,18 +59,22 @@ do_install() {
52 sed -i -e 's,@BINDIR@,${bindir},g' ${D}${systemd_unitdir}/system/distcc.service 59 sed -i -e 's,@BINDIR@,${bindir},g' ${D}${systemd_unitdir}/system/distcc.service
53 ${DESKTOPINSTALL} 60 ${DESKTOPINSTALL}
54} 61}
62
55DESKTOPINSTALL = "" 63DESKTOPINSTALL = ""
56DESKTOPINSTALL_libc-glibc () { 64DESKTOPINSTALL_libc-glibc () {
57 install -d ${D}${datadir}/distcc/ 65 install -d ${D}${datadir}/distcc/
58 install -m 0644 ${WORKDIR}/distccmon-gnome.desktop ${D}${datadir}/distcc/ 66 install -m 0644 ${WORKDIR}/distccmon-gnome.desktop ${D}${datadir}/distcc/
59} 67}
68
60PACKAGES += "distcc-distmon-gnome" 69PACKAGES += "distcc-distmon-gnome"
61 70
62FILES_${PN} = " ${sysconfdir} \ 71FILES_${PN} = " ${sysconfdir} \
63 ${bindir}/distcc \ 72 ${bindir}/distcc \
64 ${bindir}/lsdistcc \ 73 ${bindir}/lsdistcc \
65 ${bindir}/distccd \ 74 ${bindir}/distccd \
66 ${bindir}/distccmon-text \ 75 ${bindir}/distccmon-text \
67 ${systemd_unitdir}/system/distcc.service" 76 ${systemd_unitdir}/system/distcc.service"
68FILES_distcc-distmon-gnome = " ${bindir}/distccmon-gnome \ 77FILES_distcc-distmon-gnome = " ${bindir}/distccmon-gnome \
69 ${datadir}/distcc" 78 ${datadir}/distcc"
79
80RRECOMMENDS_${PN} = "avahi-daemon"