diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-04-12 09:42:59 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-04-12 12:37:52 +0100 |
commit | c37faea947ef3980934c02661ecd79cd9668b8a6 (patch) | |
tree | 5e12aec72290e7812842fe38f414a41a5b4fdab6 /meta/recipes-support/libunistring/libunistring | |
parent | b2ae65f7d1054aa98dea9f5937567bec1dbf2f20 (diff) | |
download | poky-c37faea947ef3980934c02661ecd79cd9668b8a6.tar.gz |
libunistring: Fix parallel make issue1.2_M4.rc3.1
See patch header for the full description of the parallel make issue this resolves.
(From OE-Core rev: 1b576a2412647fbbf0a17e95171efdc458f4be16)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/libunistring/libunistring')
-rw-r--r-- | meta/recipes-support/libunistring/libunistring/parallelmake.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/meta/recipes-support/libunistring/libunistring/parallelmake.patch b/meta/recipes-support/libunistring/libunistring/parallelmake.patch new file mode 100644 index 0000000000..21025b8e9d --- /dev/null +++ b/meta/recipes-support/libunistring/libunistring/parallelmake.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | Fix a parallel make race where cdefs.h uses the unused-parameter.h header file | ||
2 | but has no dependency listed. This can result in an empty cdefs.h file which | ||
3 | results in a build failure like: | ||
4 | |||
5 | | In file included from striconveh.c:30:0: | ||
6 | | unistr.h:193:48: error: expected ';', ',' or ')' before '_GL_UNUSED_PARAMETER' | ||
7 | | In file included from striconveh.c:30:0: | ||
8 | | unistr.h:263:54: error: expected ';', ',' or ')' before '_GL_UNUSED_PARAMETER' | ||
9 | |||
10 | Upstream-Status: Pending | ||
11 | |||
12 | RP 2012/4/12 | ||
13 | |||
14 | Index: libunistring-0.9.3/lib/Makefile.am | ||
15 | =================================================================== | ||
16 | --- libunistring-0.9.3.orig/lib/Makefile.am 2012-04-12 07:45:41.450059820 +0000 | ||
17 | +++ libunistring-0.9.3/lib/Makefile.am 2012-04-12 07:48:45.434055559 +0000 | ||
18 | @@ -157,7 +157,7 @@ | ||
19 | |||
20 | # unistring/cdefs.h is not public, but is included by other header files. | ||
21 | nobase_nodist_include_HEADERS += unistring/cdefs.h | ||
22 | -unistring/cdefs.h : unistring/cdefs.in.h | ||
23 | +unistring/cdefs.h : unistring/cdefs.in.h $(UNUSED_PARAMETER_H) | ||
24 | @MKDIR_P@ unistring | ||
25 | rm -f $@-t $@ | ||
26 | sed -e '/definition of _GL_UNUSED_PARAMETER/r $(UNUSED_PARAMETER_H)' \ | ||