distcc: Upgrade to 3.2

Helps compiling with clang as a side effect

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-devtools/distcc/distcc_3.1.bb b/meta/recipes-devtools/distcc/distcc_3.2.bb
similarity index 91%
rename from meta/recipes-devtools/distcc/distcc_3.1.bb
rename to meta/recipes-devtools/distcc/distcc_3.2.bb
index f8879c87c56bbce2c498fd82dc0265a161ea14a6..600ec96673039f74395829b42ddfa17ed685bdac 100644 (file)
--- a/meta/recipes-devtools/distcc/distcc_3.1.bb
+++ b/meta/recipes-devtools/distcc/distcc_3.2.bb
@@ -5,7 +5,7 @@ SECTION = "devel"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
-DEPENDS = "avahi"
+DEPENDS = "avahi binutils"
 
 GTKCONFIG = "gtk"
 GTKCONFIG_libc-uclibc = ""
@@ -17,19 +17,19 @@ PACKAGECONFIG[popt] = "--without-included-popt,--with-included-popt,popt"
 
 RRECOMMENDS_${PN} = "avahi-daemon"
 
-SRC_URI = "git://github.com/distcc/distcc.git \
+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 = "9a172d3d20042754a30c0cd9a5d63fd1a8120c31"
+SRCREV = "d8b18df3e9dcbe4f092bed565835d3975e99432c"
 S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig update-rc.d useradd systemd
 
-EXTRA_OECONF += "--disable-Werror PYTHON=/dev/null"
+EXTRA_OECONF += "--disable-Werror PYTHON='' --disable-pump-mode"
 
 USERADD_PACKAGES = "${PN}"
 USERADD_PARAM_${PN} = "--system \

diff --git a/meta/recipes-devtools/distcc/files/separatebuilddir.patch b/meta/recipes-devtools/distcc/files/separatebuilddir.patch
index b9e3e42ddffb667e3ef2a05a03e454e086f17c55..7580b5584bc93b09144bb68717f30390dafd61d1 100644 (file)
--- 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)