Patchwork [04/13] distcc: Fix case where ${B} != ${S}

login
register
mail settings
Submitter Richard Purdie
Date March 18, 2013, 2:05 a.m.
Message ID <1363572312-13399-4-git-send-email-richard.purdie@linuxfoundation.org>
Download mbox | patch
Permalink /patch/46337/
State New
Headers show

Comments

Richard Purdie - March 18, 2013, 2:05 a.m.
Add patch to fix out of tree build failures.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-devtools/distcc/distcc_3.1.bb          |    1 +
 .../distcc/files/separatebuilddir.patch             |   19 +++++++++++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 meta/recipes-devtools/distcc/files/separatebuilddir.patch
Richard Purdie - March 18, 2013, 2:14 a.m.
On Mon, 2013-03-18 at 02:05 +0000, Richard Purdie wrote:
> Add patch to fix out of tree build failures.
> 
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
>  meta/recipes-devtools/distcc/distcc_3.1.bb          |    1 +
>  .../distcc/files/separatebuilddir.patch             |   19 +++++++++++++++++++
>  2 files changed, 20 insertions(+)
>  create mode 100644 meta/recipes-devtools/distcc/files/separatebuilddir.patch

I sent the version before I squashed an Upstream-Status into the patch,
final version will have that...

Cheers,

Richard

Patch

diff --git a/meta/recipes-devtools/distcc/distcc_3.1.bb b/meta/recipes-devtools/distcc/distcc_3.1.bb
index eeda054..cb5d696 100644
--- a/meta/recipes-devtools/distcc/distcc_3.1.bb
+++ b/meta/recipes-devtools/distcc/distcc_3.1.bb
@@ -17,6 +17,7 @@  PACKAGECONFIG[gtk] = "--with-gtk,--without-gtk --without-gnome,gtk+"
 RRECOMMENDS_${PN} = "avahi-daemon"
 
 SRC_URI = "http://distcc.googlecode.com/files/${BPN}-${PV}.tar.bz2 \
+           file://separatebuilddir.patch \
            file://default \
            file://distccmon-gnome.desktop \
            file://distcc"
diff --git a/meta/recipes-devtools/distcc/files/separatebuilddir.patch b/meta/recipes-devtools/distcc/files/separatebuilddir.patch
new file mode 100644
index 0000000..d945b9b
--- /dev/null
+++ b/meta/recipes-devtools/distcc/files/separatebuilddir.patch
@@ -0,0 +1,19 @@ 
+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
+
+Index: distcc-3.1/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 @@
+ 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)