distcc: Fix case where ${B} != ${S}

Add patch to fix out of tree build failures.

(From OE-Core rev: 43da2e1fc1509d039e4ccfa31b7359c65407fde0)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2013-03-08 11:47:08 +00:00
parent 6ce799db78
commit 8df3d8656c
2 changed files with 22 additions and 0 deletions

View File

@@ -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"

View File

@@ -0,0 +1,21 @@
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: 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)