mirror of
https://git.yoctoproject.org/poky
synced 2026-05-30 12:29:55 +00:00
distcc: updated to version 3.1
Added two new flags to the configure script: --disable-Werror: don't treat all warnings all errors (which breaks compilation). PYTHON=/dev/null: this prevents distcc from detecting the host Python and trying to build its include server using the host Python. This disables the include server completely. If the include server is needed, that should be the object of another patch (and would introduce a dependency on python for distcc). The 'distcc-avahi' and 'makefile-param-order' patches are not needed anymore, as they were merged upstream. (From OE-Core rev: 3f33a6ecd9f1703381e175d688bdfce291ffdc8a) Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
57bbb7d6f4
commit
691a9908f5
+9
-10
@@ -4,7 +4,7 @@ compilation of C/C++/ObjC code across machines on a network."
|
||||
SECTION = "devel"
|
||||
LICENSE = "GPLv2"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
|
||||
PR = "r9"
|
||||
PR = "r0"
|
||||
|
||||
DEPENDS = "avahi"
|
||||
|
||||
@@ -16,20 +16,18 @@ PACKAGECONFIG[gtk] = "--with-gtk,--without-gtk --without-gnome,gtk+"
|
||||
|
||||
RRECOMMENDS_${PN} = "avahi-daemon"
|
||||
|
||||
# Upstream change this patch periodically so store locally
|
||||
# http://0pointer.de/public/distcc-avahi.patch
|
||||
SRC_URI = "http://distcc.googlecode.com/files/${BPN}-${PV}.tar.bz2 \
|
||||
file://distcc-avahi.patch \
|
||||
file://makefile-param-order.patch \
|
||||
file://default \
|
||||
file://distccmon-gnome.desktop \
|
||||
file://distcc"
|
||||
file://default \
|
||||
file://distccmon-gnome.desktop \
|
||||
file://distcc"
|
||||
|
||||
SRC_URI[md5sum] = "0d6b80a1efc3a3d816c4f4175f63eaa2"
|
||||
SRC_URI[sha256sum] = "6500f1bc2a30b1f044ebed79c6ce15457d1712263e65f0db7d6046af262ba434"
|
||||
SRC_URI[md5sum] = "a1a9d3853df7133669fffec2a9aab9f3"
|
||||
SRC_URI[sha256sum] = "f55dbafd76bed3ce57e1bbcdab1329227808890d90f4c724fcd2d53f934ddd89"
|
||||
|
||||
inherit autotools pkgconfig update-rc.d useradd
|
||||
|
||||
EXTRA_OECONF += "--disable-Werror PYTHON=/dev/null"
|
||||
|
||||
USERADD_PACKAGES = "${PN}"
|
||||
USERADD_PARAM_${PN} = "--system \
|
||||
--home /dev/null \
|
||||
@@ -55,6 +53,7 @@ PACKAGES += "distcc-distmon-gnome"
|
||||
|
||||
FILES_${PN} = " ${sysconfdir} \
|
||||
${bindir}/distcc \
|
||||
${bindir}/lsdistcc \
|
||||
${bindir}/distccd \
|
||||
${bindir}/distccmon-text"
|
||||
FILES_distcc-distmon-gnome = " ${bindir}/distccmon-gnome \
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,20 +0,0 @@
|
||||
distcc: Put the "-lLIB" parameter in the end of the gcc command.
|
||||
|
||||
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
diff -ruN distcc-2.18.3-orig/Makefile.in distcc-2.18.3/Makefile.in
|
||||
--- distcc-2.18.3-orig/Makefile.in 2011-07-25 16:43:21.000000000 +0800
|
||||
+++ distcc-2.18.3/Makefile.in 2011-07-25 16:45:39.000000000 +0800
|
||||
@@ -378,8 +378,8 @@
|
||||
|
||||
distccmon-gnome@EXEEXT@: $(mon_obj) $(gnome_obj)
|
||||
$(CC) -o $@ $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(LIBS) \
|
||||
- $(GNOME_CFLAGS) $(GNOME_LIBS) \
|
||||
- $(mon_obj) $(gnome_obj)
|
||||
+ $(GNOME_CFLAGS) \
|
||||
+ $(mon_obj) $(gnome_obj) $(GNOME_LIBS)
|
||||
|
||||
|
||||
## Dist targets
|
||||
Reference in New Issue
Block a user