diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-21 14:18:06 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-22 16:54:35 +0000 |
commit | 211aeccc17b532d71938beaca274efcad2e3fb0b (patch) | |
tree | 744dc663e0924fc4685e75b8754fa3b8d98f5f8d /meta/recipes-extended/libuser/libuser | |
parent | 6211a2bdd32f7b2c8de7a5d75353c0522c8d4230 (diff) | |
download | poky-211aeccc17b532d71938beaca274efcad2e3fb0b.tar.gz |
libuser: Fix case where ${B} != ${S}
Fix out of tree builds and a parallel make race, see the patch header
for details.
(From OE-Core rev: ef259227fc6d8147b493554e381aa196f5a7a96a)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/libuser/libuser')
-rw-r--r-- | meta/recipes-extended/libuser/libuser/fixsepbuild.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/meta/recipes-extended/libuser/libuser/fixsepbuild.patch b/meta/recipes-extended/libuser/libuser/fixsepbuild.patch new file mode 100644 index 0000000000..27e6bc6ff1 --- /dev/null +++ b/meta/recipes-extended/libuser/libuser/fixsepbuild.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | Fix out of tree build errors and parallel make issues. The mkdir commands | ||
2 | can race each other. The srcdir variable is a complete path so a ../ prefix makes | ||
3 | no sense. | ||
4 | |||
5 | Upstream-Status: Pending | ||
6 | |||
7 | RP 2013/03/21 | ||
8 | |||
9 | Index: libuser/docs/Makefile.am | ||
10 | =================================================================== | ||
11 | --- libuser/docs.orig/Makefile.am 2012-11-08 02:25:58.000000000 +0000 | ||
12 | +++ libuser/docs/Makefile.am 2013-03-21 14:15:40.756950231 +0000 | ||
13 | @@ -13,9 +13,9 @@ | ||
14 | < $(srcdir)/libuser.conf.5.in > $@ | ||
15 | |||
16 | sgml/libuser.txt: $(srcdir)/sgml/libuser.sgml | ||
17 | - [ -d sgml ] || mkdir sgml | ||
18 | - cd sgml; sgml2txt ../$(srcdir)/sgml/libuser.sgml | ||
19 | + [ -d sgml ] || mkdir sgml || true | ||
20 | + cd sgml; sgml2txt $(srcdir)/sgml/libuser.sgml | ||
21 | |||
22 | sgml/libuser.html: $(srcdir)/sgml/libuser.sgml | ||
23 | - [ -d sgml ] || mkdir sgml | ||
24 | - cd sgml; sgml2html ../$(srcdir)/sgml/libuser.sgml | ||
25 | + [ -d sgml ] || mkdir sgml || true | ||
26 | + cd sgml; sgml2html $(srcdir)/sgml/libuser.sgml | ||