sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity
generic-poky/meta/recipes-extended/libuser/libuser/fixsepbuild.patch

36 lines
1.3 KiB
Diff
Raw Normal View History

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>
2013-03-21 14:18:06 +00:00
Fix out of tree build errors and parallel make issues. The mkdir commands
can race each other. The srcdir variable is a complete path so a ../ prefix makes
no sense.
Upstream-Status: Pending
RP 2013/03/21
libuser: Use abs_srcdir instead of srcdir srcdir is still relative to pwd. We need to use abs_srcdir to get absolute source directory names (From OE-Core rev: 9297e01b2095d90b5365d23c10de699a7cf411ea) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-23 06:42:25 +00:00
Index: libuser-0.58/docs/Makefile.am
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>
2013-03-21 14:18:06 +00:00
===================================================================
libuser: Use abs_srcdir instead of srcdir srcdir is still relative to pwd. We need to use abs_srcdir to get absolute source directory names (From OE-Core rev: 9297e01b2095d90b5365d23c10de699a7cf411ea) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-23 06:42:25 +00:00
--- libuser-0.58.orig/docs/Makefile.am 2012-11-07 18:25:58.000000000 -0800
+++ libuser-0.58/docs/Makefile.am 2013-03-22 23:32:06.843518069 -0700
@@ -8,14 +8,14 @@
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>
2013-03-21 14:18:06 +00:00
libuser: Use abs_srcdir instead of srcdir srcdir is still relative to pwd. We need to use abs_srcdir to get absolute source directory names (From OE-Core rev: 9297e01b2095d90b5365d23c10de699a7cf411ea) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-23 06:42:25 +00:00
all: sgml/libuser.txt sgml/libuser.html
-libuser.conf.5: $(srcdir)/libuser.conf.5.in Makefile
+libuser.conf.5: $(abs_srcdir)/libuser.conf.5.in Makefile
sed 's,@sysconfdir\@,$(sysconfdir),g' \
- < $(srcdir)/libuser.conf.5.in > $@
+ < $(abs_srcdir)/libuser.conf.5.in > $@
-sgml/libuser.txt: $(srcdir)/sgml/libuser.sgml
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>
2013-03-21 14:18:06 +00:00
- [ -d sgml ] || mkdir sgml
- cd sgml; sgml2txt ../$(srcdir)/sgml/libuser.sgml
libuser: Use abs_srcdir instead of srcdir srcdir is still relative to pwd. We need to use abs_srcdir to get absolute source directory names (From OE-Core rev: 9297e01b2095d90b5365d23c10de699a7cf411ea) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-23 06:42:25 +00:00
+sgml/libuser.txt: $(abs_srcdir)/sgml/libuser.sgml
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>
2013-03-21 14:18:06 +00:00
+ [ -d sgml ] || mkdir sgml || true
libuser: Use abs_srcdir instead of srcdir srcdir is still relative to pwd. We need to use abs_srcdir to get absolute source directory names (From OE-Core rev: 9297e01b2095d90b5365d23c10de699a7cf411ea) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-23 06:42:25 +00:00
+ cd sgml; sgml2txt $(abs_srcdir)/sgml/libuser.sgml
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>
2013-03-21 14:18:06 +00:00
libuser: Use abs_srcdir instead of srcdir srcdir is still relative to pwd. We need to use abs_srcdir to get absolute source directory names (From OE-Core rev: 9297e01b2095d90b5365d23c10de699a7cf411ea) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-23 06:42:25 +00:00
-sgml/libuser.html: $(srcdir)/sgml/libuser.sgml
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>
2013-03-21 14:18:06 +00:00
- [ -d sgml ] || mkdir sgml
- cd sgml; sgml2html ../$(srcdir)/sgml/libuser.sgml
libuser: Use abs_srcdir instead of srcdir srcdir is still relative to pwd. We need to use abs_srcdir to get absolute source directory names (From OE-Core rev: 9297e01b2095d90b5365d23c10de699a7cf411ea) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-23 06:42:25 +00:00
+sgml/libuser.html: $(abs_srcdir)/sgml/libuser.sgml
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>
2013-03-21 14:18:06 +00:00
+ [ -d sgml ] || mkdir sgml || true
libuser: Use abs_srcdir instead of srcdir srcdir is still relative to pwd. We need to use abs_srcdir to get absolute source directory names (From OE-Core rev: 9297e01b2095d90b5365d23c10de699a7cf411ea) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-23 06:42:25 +00:00
+ cd sgml; sgml2html $(abs_srcdir)/sgml/libuser.sgml