diff options
Diffstat (limited to 'meta/recipes-devtools/distcc')
6 files changed, 90 insertions, 132 deletions
diff --git a/meta/recipes-devtools/distcc/distcc_3.2.bb b/meta/recipes-devtools/distcc/distcc_3.2.bb deleted file mode 100644 index b6da65a582..0000000000 --- a/meta/recipes-devtools/distcc/distcc_3.2.bb +++ /dev/null @@ -1,68 +0,0 @@ -SUMMARY = "A parallel build system" -DESCRIPTION = "distcc is a parallel build system that distributes \ -compilation of C/C++/ObjC code across machines on a network." -SECTION = "devel" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -DEPENDS = "avahi binutils" - -PACKAGECONFIG ??= "popt" -PACKAGECONFIG[gtk] = "--with-gtk,--without-gtk --without-gnome,gtk+" -# use system popt by default -PACKAGECONFIG[popt] = "--without-included-popt,--with-included-popt,popt" - -RRECOMMENDS_${PN} = "avahi-daemon" - -SRC_URI = "git://github.com/distcc/distcc.git;branch=${PV} \ - file://separatebuilddir.patch \ - file://0001-zeroconf-Include-fcntl.h.patch \ - file://default \ - file://distccmon-gnome.desktop \ - file://distcc \ - file://distcc.service" -SRCREV = "d8b18df3e9dcbe4f092bed565835d3975e99432c" -S = "${WORKDIR}/git" -UPSTREAM_VERSION_UNKNOWN = "1" - -inherit autotools pkgconfig update-rc.d useradd systemd - -EXTRA_OECONF += "--disable-Werror PYTHON='' --disable-pump-mode" - -USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "--system \ - --home /dev/null \ - --no-create-home \ - --gid nogroup \ - distcc" - -INITSCRIPT_NAME = "distcc" - -SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "distcc.service" - -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 - install -d ${D}${systemd_unitdir}/system/ - install -m 0644 ${WORKDIR}/distcc.service ${D}${systemd_unitdir}/system - sed -i -e 's,@BINDIR@,${bindir},g' ${D}${systemd_unitdir}/system/distcc.service - ${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} \ - ${bindir}/distcc \ - ${bindir}/lsdistcc \ - ${bindir}/distccd \ - ${bindir}/distccmon-text \ - ${systemd_unitdir}/system/distcc.service" -FILES_distcc-distmon-gnome = " ${bindir}/distccmon-gnome \ - ${datadir}/distcc" diff --git a/meta/recipes-devtools/distcc/distcc_3.4.bb b/meta/recipes-devtools/distcc/distcc_3.4.bb new file mode 100644 index 0000000000..ab138b3ab6 --- /dev/null +++ b/meta/recipes-devtools/distcc/distcc_3.4.bb @@ -0,0 +1,88 @@ +SUMMARY = "A parallel build system" +DESCRIPTION = "distcc is a parallel build system that distributes \ +compilation of C/C++/ObjC code across machines on a network." +HOMEPAGE = "https://github.com/distcc/distcc" +SECTION = "devel" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +DEPENDS = "avahi binutils" + +PACKAGECONFIG ??= "popt" +PACKAGECONFIG[gtk] = "--with-gtk,--without-gtk --without-gnome,gtk+" +# use system popt by default +PACKAGECONFIG[popt] = "--without-included-popt,--with-included-popt,popt" + +RRECOMMENDS:${PN}-server = "avahi-daemon" + +SRC_URI = "git://github.com/distcc/distcc.git;branch=master;protocol=https \ + file://default \ + file://distcc \ + file://distcc.service \ + " +SRCREV = "50d821efe99cae82c05be0a4ab3b4035ef0d3883" +S = "${WORKDIR}/git" +UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" + +inherit autotools pkgconfig update-rc.d useradd systemd + +ASNEEDED = "" + +EXTRA_OECONF += "--disable-Werror PYTHON='' --disable-pump-mode" + +PACKAGE_BEFORE_PN = "${PN}-distmon-gnome ${PN}-server" + +USERADD_PACKAGES = "${PN}-server" +USERADD_PARAM:${PN}-server = "--system \ + --home /dev/null \ + --no-create-home \ + --gid nogroup \ + distcc" + +UPDATERCPN = "${PN}-server" +INITSCRIPT_NAME = "distcc" + +SYSTEMD_PACKAGES = "${PN}-server" +SYSTEMD_SERVICE:${PN}-server = "distcc.service" + +do_install() { + # Improve reproducibility: compress w/o timestamps + oe_runmake 'DESTDIR=${D}' "GZIP_BIN=gzip -n" install + install -d ${D}${sysconfdir}/init.d/ + install -d ${D}${sysconfdir}/default + install -m 0755 ${UNPACKDIR}/distcc ${D}${sysconfdir}/init.d/ + install -m 0755 ${UNPACKDIR}/default ${D}${sysconfdir}/default/distcc + install -d ${D}${systemd_system_unitdir}/ + install -m 0644 ${UNPACKDIR}/distcc.service ${D}${systemd_system_unitdir} + sed -i -e 's,@BINDIR@,${bindir},g' ${D}${systemd_system_unitdir}/distcc.service +} + +FILES:${PN}-server = "${sysconfdir} \ + ${bindir}/distccd \ + ${sbindir}" +FILES:${PN}-distmon-gnome = "${bindir}/distccmon-gnome \ + ${datadir}/applications \ + ${datadir}/pixmaps" + +# +# distcc upstream dropped the 3.2 branch which we reference in older project releases +# the revisions are there, just the branch is not. In order to be able to continue +# to build those old releases, adjust any mirror tarball to contain the missing branch +# +fixup_distcc_mirror_tarball () { + TBALL=${DL_DIR}/git2_github.com.distcc.distcc.git.tar.gz + if [ -f $TBALL ]; then + TDIR=`mktemp -d` + cd $TDIR + tar -xzf $TBALL + set +e + git rev-parse --verify 3.2 + if [ "$?" != "0" ]; then + git branch 3.2 d8b18df3e9dcbe4f092bed565835d3975e99432c + tar -czf $TBALL * + fi + set -e + rm -rf $TDIR/* + fi +} +do_fetch[postfuncs] += "fixup_distcc_mirror_tarball" diff --git a/meta/recipes-devtools/distcc/files/0001-zeroconf-Include-fcntl.h.patch b/meta/recipes-devtools/distcc/files/0001-zeroconf-Include-fcntl.h.patch deleted file mode 100644 index b17ec9c959..0000000000 --- a/meta/recipes-devtools/distcc/files/0001-zeroconf-Include-fcntl.h.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 8331fc4759d809512f404e7a27f817ad6d616450 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 13 Apr 2015 18:00:33 -0700 -Subject: [PATCH] zeroconf: Include fcntl.h - -We need it for getting deinitions for O_* e.g. O_CREAT - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/zeroconf.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/zeroconf.c b/src/zeroconf.c -index 414ddc4..31bd33f 100644 ---- a/src/zeroconf.c -+++ b/src/zeroconf.c -@@ -33,6 +33,7 @@ - #include <unistd.h> - #include <stdlib.h> - #include <limits.h> -+#include <fcntl.h> - - #include <avahi-common/domain.h> - #include <avahi-common/error.h> --- -2.1.4 - diff --git a/meta/recipes-devtools/distcc/files/default b/meta/recipes-devtools/distcc/files/default index 63c4159b9d..a5bc13ecf3 100644 --- a/meta/recipes-devtools/distcc/files/default +++ b/meta/recipes-devtools/distcc/files/default @@ -16,9 +16,9 @@ STARTDISTCC="true" # # ALLOWEDNETS="127.0.0.1" -ALLOWEDNETS="192.168.7.0/24" +ALLOWEDNETS="127.0.0.1" # # OPTIONS is used for the systemd service file # -OPTIONS="--allow 192.168.7.0/24" +OPTIONS="--allow 127.0.0.1 --enable-tcp-insecure" diff --git a/meta/recipes-devtools/distcc/files/distccmon-gnome.desktop b/meta/recipes-devtools/distcc/files/distccmon-gnome.desktop deleted file mode 100644 index 7b5d85ce4e..0000000000 --- a/meta/recipes-devtools/distcc/files/distccmon-gnome.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Version=0.9.4 -Exec=distccmon-gnome -Name=distcc monitor -GenericName=Distributed Compile Monitor -Comment=Graphical view of distributed compile tasks -Icon=distccmon-gnome-icon -TryExec=distccmon-gnome -Terminal=false -Type=Application -Categories=GNOME;Development; -StartupNotify=true diff --git a/meta/recipes-devtools/distcc/files/separatebuilddir.patch b/meta/recipes-devtools/distcc/files/separatebuilddir.patch deleted file mode 100644 index 7580b5584b..0000000000 --- a/meta/recipes-devtools/distcc/files/separatebuilddir.patch +++ /dev/null @@ -1,21 +0,0 @@ -When building with a separate build directory, make install fails, -unable to find the gnome_data files. This patch corrects the -patch and ensures the build works in this case. - -RP 2013/3/8 - -Upstream-Status: Pending - -Index: git/Makefile.in -=================================================================== ---- git.orig/Makefile.in -+++ git/Makefile.in -@@ -1117,7 +1117,7 @@ install-example: $(example_DOCS) - install-gnome-data: $(gnome_data) - $(mkinstalldirs) "$(DESTDIR)$(pkgdatadir)" - for p in $(gnome_data); do \ -- $(INSTALL_DATA) "$$p" "$(DESTDIR)$(pkgdatadir)" || exit 1; \ -+ $(INSTALL_DATA) "$(srcdir)/$$p" "$(DESTDIR)$(pkgdatadir)" || exit 1; \ - done - - install-conf: $(conf_files) $(default_files) |