summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-08 11:47:08 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-18 13:18:25 +0000
commit8df3d8656cd52abf30b131d3f3f5e55596211f2a (patch)
treef21763c7bc462e8de61f35d409a08ef69caf29b8
parent6ce799db7811a25d437c5847ad12a16ebaa95b3f (diff)
downloadpoky-8df3d8656cd52abf30b131d3f3f5e55596211f2a.tar.gz
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>
-rw-r--r--meta/recipes-devtools/distcc/distcc_3.1.bb1
-rw-r--r--meta/recipes-devtools/distcc/files/separatebuilddir.patch21
2 files changed, 22 insertions, 0 deletions
diff --git a/meta/recipes-devtools/distcc/distcc_3.1.bb b/meta/recipes-devtools/distcc/distcc_3.1.bb
index eeda054c74..cb5d696ce2 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+"
17RRECOMMENDS_${PN} = "avahi-daemon" 17RRECOMMENDS_${PN} = "avahi-daemon"
18 18
19SRC_URI = "http://distcc.googlecode.com/files/${BPN}-${PV}.tar.bz2 \ 19SRC_URI = "http://distcc.googlecode.com/files/${BPN}-${PV}.tar.bz2 \
20 file://separatebuilddir.patch \
20 file://default \ 21 file://default \
21 file://distccmon-gnome.desktop \ 22 file://distccmon-gnome.desktop \
22 file://distcc" 23 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 0000000000..b9e3e42ddf
--- /dev/null
+++ b/meta/recipes-devtools/distcc/files/separatebuilddir.patch
@@ -0,0 +1,21 @@
1When building with a separate build directory, make install fails,
2unable to find the gnome_data files. This patch corrects the
3patch and ensures the build works in this case.
4
5RP 2013/3/8
6
7Upstream-Status: Pending
8
9Index: distcc-3.1/Makefile.in
10===================================================================
11--- distcc-3.1.orig/Makefile.in 2008-12-02 21:50:31.000000000 +0000
12+++ distcc-3.1/Makefile.in 2013-03-08 10:49:24.224400937 +0000
13@@ -1088,7 +1088,7 @@
14 install-gnome-data: $(gnome_data)
15 $(mkinstalldirs) "$(DESTDIR)$(pkgdatadir)"
16 for p in $(gnome_data); do \
17- $(INSTALL_DATA) "$$p" "$(DESTDIR)$(pkgdatadir)" || exit 1; \
18+ $(INSTALL_DATA) "$(srcdir)/$$p" "$(DESTDIR)$(pkgdatadir)" || exit 1; \
19 done
20
21 install-conf: $(conf_files) $(default_files)