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:18:25 +0000 |
commit | 8df3d8656cd52abf30b131d3f3f5e55596211f2a (patch) | |
tree | f21763c7bc462e8de61f35d409a08ef69caf29b8 /meta/recipes-devtools/distcc/files/separatebuilddir.patch | |
parent | 6ce799db7811a25d437c5847ad12a16ebaa95b3f (diff) | |
download | poky-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>
Diffstat (limited to 'meta/recipes-devtools/distcc/files/separatebuilddir.patch')
-rw-r--r-- | meta/recipes-devtools/distcc/files/separatebuilddir.patch | 21 |
1 files changed, 21 insertions, 0 deletions
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 @@ | |||
1 | When building with a separate build directory, make install fails, | ||
2 | unable to find the gnome_data files. This patch corrects the | ||
3 | patch and ensures the build works in this case. | ||
4 | |||
5 | RP 2013/3/8 | ||
6 | |||
7 | Upstream-Status: Pending | ||
8 | |||
9 | Index: 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) | ||