Patchwork [01/16] libuser: Fix case where ${B} != ${S}

login
register
mail settings
Submitter Richard Purdie
Date March 21, 2013, 3:55 p.m.
Message ID <1363881315-24352-1-git-send-email-richard.purdie@linuxfoundation.org>
Download mbox | patch
Permalink /patch/46657/
State Accepted
Commit ef259227fc6d8147b493554e381aa196f5a7a96a
Headers show

Comments

Richard Purdie - March 21, 2013, 3:55 p.m.
Fix out of tree builds and a parallel make race, see the patch header
for details.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../libuser/libuser/fixsepbuild.patch              |   26 ++++++++++++++++++++
 meta/recipes-extended/libuser/libuser_0.58.bb      |    3 ++-
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-extended/libuser/libuser/fixsepbuild.patch
Ross Burton - March 21, 2013, 4:30 p.m.
On 21 March 2013 15:55, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> Fix out of tree builds and a parallel make race, see the patch header
> for details.

As there's no cover letter, I'll reply to this.  From a reading of the
patches (no build testing) it looks good, so Acked-by: Ross Burton
<ross.burton@intel.com>.

Ross
Khem Raj - March 23, 2013, 2:58 a.m.
On Mar 21, 2013, at 9:30 AM, "Burton, Ross" <ross.burton@intel.com> wrote:

> On 21 March 2013 15:55, Richard Purdie
> <richard.purdie@linuxfoundation.org> wrote:
>> Fix out of tree builds and a parallel make race, see the patch header
>> for details.
> 
> As there's no cover letter, I'll reply to this.  From a reading of the
> patches (no build testing) it looks good, so Acked-by: Ross Burton
> <ross.burton@intel.com>.


on the contrary it broke my -j 20 build

| LinuxdocTools::process_file: Cannot find ./sgml/libuser.sgml. Aborting ...
| LinuxdocTools::process_file: Cannot find ./sgml/libuser.sgml. Aborting ...
| Processing file ./sgml/libuser.sgml
| Processing file ./sgml/libuser.sgml
| make[2]: *** [sgml/libuser.txt] Error 2
| make[2]: *** Waiting for unfinished jobs....
| make[2]: *** [sgml/libuser.html] Error 2


> 
> Ross
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Khem Raj - March 23, 2013, 6:46 a.m.
On Mar 22, 2013, at 7:58 PM, Khem Raj <raj.khem@gmail.com> wrote:

> 
> On Mar 21, 2013, at 9:30 AM, "Burton, Ross" <ross.burton@intel.com> wrote:
> 
>> On 21 March 2013 15:55, Richard Purdie
>> <richard.purdie@linuxfoundation.org> wrote:
>>> Fix out of tree builds and a parallel make race, see the patch header
>>> for details.
>> 
>> As there's no cover letter, I'll reply to this.  From a reading of the
>> patches (no build testing) it looks good, so Acked-by: Ross Burton
>> <ross.burton@intel.com>.
> 
> 
> on the contrary it broke my -j 20 build
> 
> | LinuxdocTools::process_file: Cannot find ./sgml/libuser.sgml. Aborting ...
> | LinuxdocTools::process_file: Cannot find ./sgml/libuser.sgml. Aborting ...
> | Processing file ./sgml/libuser.sgml
> | Processing file ./sgml/libuser.sgml
> | make[2]: *** [sgml/libuser.txt] Error 2
> | make[2]: *** Waiting for unfinished jobs....
> | make[2]: *** [sgml/libuser.html] Error 2
> 
> 


posted a patch here

http://lists.linuxtogo.org/pipermail/openembedded-core/2013-March/037410.html

which should fix both cases of building in srctree and outside of srctree.


>> 
>> Ross
>> 
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>

Patch

diff --git a/meta/recipes-extended/libuser/libuser/fixsepbuild.patch b/meta/recipes-extended/libuser/libuser/fixsepbuild.patch
new file mode 100644
index 0000000..27e6bc6
--- /dev/null
+++ b/meta/recipes-extended/libuser/libuser/fixsepbuild.patch
@@ -0,0 +1,26 @@ 
+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
+
+Index: libuser/docs/Makefile.am
+===================================================================
+--- libuser/docs.orig/Makefile.am	2012-11-08 02:25:58.000000000 +0000
++++ libuser/docs/Makefile.am	2013-03-21 14:15:40.756950231 +0000
+@@ -13,9 +13,9 @@
+ 		< $(srcdir)/libuser.conf.5.in > $@
+ 
+ sgml/libuser.txt: $(srcdir)/sgml/libuser.sgml
+-	[ -d sgml ] || mkdir sgml
+-	cd sgml; sgml2txt ../$(srcdir)/sgml/libuser.sgml
++	[ -d sgml ] || mkdir sgml || true
++	cd sgml; sgml2txt $(srcdir)/sgml/libuser.sgml
+ 
+ sgml/libuser.html: $(srcdir)/sgml/libuser.sgml
+-	[ -d sgml ] || mkdir sgml
+-	cd sgml; sgml2html ../$(srcdir)/sgml/libuser.sgml
++	[ -d sgml ] || mkdir sgml || true
++	cd sgml; sgml2html $(srcdir)/sgml/libuser.sgml
diff --git a/meta/recipes-extended/libuser/libuser_0.58.bb b/meta/recipes-extended/libuser/libuser_0.58.bb
index fbd3dd5..c1fe49d 100644
--- a/meta/recipes-extended/libuser/libuser_0.58.bb
+++ b/meta/recipes-extended/libuser/libuser_0.58.bb
@@ -11,7 +11,8 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
 
 SECTION = "base"
 
-SRC_URI = "https://fedorahosted.org/releases/l/i/libuser/libuser-${PV}.tar.xz"
+SRC_URI = "https://fedorahosted.org/releases/l/i/libuser/libuser-${PV}.tar.xz \
+           file://fixsepbuild.patch"
 
 SRC_URI[md5sum] = "1fc3ef3f3a3955b2d78562ff4daed793"
 SRC_URI[sha256sum] = "12a0c09d016d80687e04227a00a89e3c056d3b48bfa2444a9028e6474d8e1dbd"