From 278f8e82d682e4ba03b183a751fb2df9c7be64ac Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 11 May 2016 10:35:42 -0700 Subject: distcc: Upgrade to 3.2 Helps compiling with clang as a side effect (From OE-Core rev: d0666b30d5596a9300fdde19b1e2053957087c55) Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-devtools/distcc/distcc_3.1.bb | 74 ---------------------- meta/recipes-devtools/distcc/distcc_3.2.bb | 74 ++++++++++++++++++++++ .../distcc/files/separatebuilddir.patch | 14 ++-- 3 files changed, 81 insertions(+), 81 deletions(-) delete mode 100644 meta/recipes-devtools/distcc/distcc_3.1.bb create mode 100644 meta/recipes-devtools/distcc/distcc_3.2.bb (limited to 'meta') diff --git a/meta/recipes-devtools/distcc/distcc_3.1.bb b/meta/recipes-devtools/distcc/distcc_3.1.bb deleted file mode 100644 index f8879c87c5..0000000000 --- a/meta/recipes-devtools/distcc/distcc_3.1.bb +++ /dev/null @@ -1,74 +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" - -GTKCONFIG = "gtk" -GTKCONFIG_libc-uclibc = "" - -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '${GTKCONFIG}', '', d)} 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 \ - file://separatebuilddir.patch \ - file://0001-zeroconf-Include-fcntl.h.patch \ - file://default \ - file://distccmon-gnome.desktop \ - file://distcc \ - file://distcc.service" -SRCREV = "9a172d3d20042754a30c0cd9a5d63fd1a8120c31" -S = "${WORKDIR}/git" - -inherit autotools pkgconfig update-rc.d useradd systemd - -EXTRA_OECONF += "--disable-Werror PYTHON=/dev/null" - -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" - -pkg_postrm_${PN} () { - deluser distcc || true -} diff --git a/meta/recipes-devtools/distcc/distcc_3.2.bb b/meta/recipes-devtools/distcc/distcc_3.2.bb new file mode 100644 index 0000000000..600ec96673 --- /dev/null +++ b/meta/recipes-devtools/distcc/distcc_3.2.bb @@ -0,0 +1,74 @@ +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" + +GTKCONFIG = "gtk" +GTKCONFIG_libc-uclibc = "" + +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '${GTKCONFIG}', '', d)} 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" + +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" + +pkg_postrm_${PN} () { + deluser distcc || true +} diff --git a/meta/recipes-devtools/distcc/files/separatebuilddir.patch b/meta/recipes-devtools/distcc/files/separatebuilddir.patch index b9e3e42ddf..7580b5584b 100644 --- a/meta/recipes-devtools/distcc/files/separatebuilddir.patch +++ b/meta/recipes-devtools/distcc/files/separatebuilddir.patch @@ -6,16 +6,16 @@ RP 2013/3/8 Upstream-Status: Pending -Index: distcc-3.1/Makefile.in +Index: git/Makefile.in =================================================================== ---- distcc-3.1.orig/Makefile.in 2008-12-02 21:50:31.000000000 +0000 -+++ distcc-3.1/Makefile.in 2013-03-08 10:49:24.224400937 +0000 -@@ -1088,7 +1088,7 @@ +--- 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; \ + 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) -- cgit v1.2.3-54-g00ecf