aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/libunistring/libunistring
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-12 09:42:59 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-12 12:37:33 +0100
commit1b576a2412647fbbf0a17e95171efdc458f4be16 (patch)
tree05d9c9790cb2e844d72aa1d405b71ebeb592ae7e /meta/recipes-support/libunistring/libunistring
parent9815b7a95ac33d3234073cdd204d9389b4241189 (diff)
downloadopenembedded-core-1b576a2412647fbbf0a17e95171efdc458f4be16.tar.gz
openembedded-core-1b576a2412647fbbf0a17e95171efdc458f4be16.tar.bz2
openembedded-core-1b576a2412647fbbf0a17e95171efdc458f4be16.zip
libunistring: Fix parallel make issue
See patch header for the full description of the parallel make issue this resolves. 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.patch26
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 @@
+Fix a parallel make race where cdefs.h uses the unused-parameter.h header file
+but has no dependency listed. This can result in an empty cdefs.h file which
+results in a build failure like:
+
+| In file included from striconveh.c:30:0:
+| unistr.h:193:48: error: expected ';', ',' or ')' before '_GL_UNUSED_PARAMETER'
+| In file included from striconveh.c:30:0:
+| unistr.h:263:54: error: expected ';', ',' or ')' before '_GL_UNUSED_PARAMETER'
+
+Upstream-Status: Pending
+
+RP 2012/4/12
+
+Index: libunistring-0.9.3/lib/Makefile.am
+===================================================================
+--- libunistring-0.9.3.orig/lib/Makefile.am 2012-04-12 07:45:41.450059820 +0000
++++ libunistring-0.9.3/lib/Makefile.am 2012-04-12 07:48:45.434055559 +0000
+@@ -157,7 +157,7 @@
+
+ # unistring/cdefs.h is not public, but is included by other header files.
+ nobase_nodist_include_HEADERS += unistring/cdefs.h
+-unistring/cdefs.h : unistring/cdefs.in.h
++unistring/cdefs.h : unistring/cdefs.in.h $(UNUSED_PARAMETER_H)
+ @MKDIR_P@ unistring
+ rm -f $@-t $@
+ sed -e '/definition of _GL_UNUSED_PARAMETER/r $(UNUSED_PARAMETER_H)' \