diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-08 11:47:08 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-18 13:17:40 +0000 |
| commit | 43da2e1fc1509d039e4ccfa31b7359c65407fde0 (patch) | |
| tree | fc69a9447585b994650abdbdcf10fb5d1258f99a /meta/recipes-devtools/distcc | |
| parent | f0ccc06a051d5db2fee5aa52b066563d403f6e25 (diff) | |
| download | openembedded-core-43da2e1fc1509d039e4ccfa31b7359c65407fde0.tar.gz openembedded-core-43da2e1fc1509d039e4ccfa31b7359c65407fde0.tar.bz2 openembedded-core-43da2e1fc1509d039e4ccfa31b7359c65407fde0.zip | |
distcc: Fix case where ${B} != ${S}
Add patch to fix out of tree build failures.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/distcc')
| -rw-r--r-- | meta/recipes-devtools/distcc/distcc_3.1.bb | 1 | ||||
| -rw-r--r-- | meta/recipes-devtools/distcc/files/separatebuilddir.patch | 21 |
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+" 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 0000000000..b9e3e42ddf --- /dev/null +++ b/meta/recipes-devtools/distcc/files/separatebuilddir.patch @@ -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) |