summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-12 08:42:59 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-12 11:37:52 (GMT)
commitc37faea947ef3980934c02661ecd79cd9668b8a6 (patch)
tree5e12aec72290e7812842fe38f414a41a5b4fdab6
parentb2ae65f7d1054aa98dea9f5937567bec1dbf2f20 (diff)
downloadpoky-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>
-rw-r--r--meta/recipes-support/libunistring/libunistring/parallelmake.patch26
-rw-r--r--meta/recipes-support/libunistring/libunistring_0.9.3.bb5
2 files changed, 29 insertions, 2 deletions
diff --git a/meta/recipes-support/libunistring/libunistring/parallelmake.patch b/meta/recipes-support/libunistring/libunistring/parallelmake.patch
new file mode 100644
index 0000000..21025b8
--- /dev/null
+++ b/meta/recipes-support/libunistring/libunistring/parallelmake.patch
@@ -0,0 +1,26 @@
1Fix a parallel make race where cdefs.h uses the unused-parameter.h header file
2but has no dependency listed. This can result in an empty cdefs.h file which
3results 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
10Upstream-Status: Pending
11
12RP 2012/4/12
13
14Index: 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)' \
diff --git a/meta/recipes-support/libunistring/libunistring_0.9.3.bb b/meta/recipes-support/libunistring/libunistring_0.9.3.bb
index eabe115..02a28f4 100644
--- a/meta/recipes-support/libunistring/libunistring_0.9.3.bb
+++ b/meta/recipes-support/libunistring/libunistring_0.9.3.bb
@@ -17,12 +17,13 @@ LICENSE = "GPLv3&LGPLv3"
17LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ 17LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
18 file://COPYING.LIB;md5=6a6a8e020838b23406c81b19c1d46df6" 18 file://COPYING.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
19 19
20SRC_URI = "${GNU_MIRROR}/libunistring/libunistring-${PV}.tar.gz" 20SRC_URI = "${GNU_MIRROR}/libunistring/libunistring-${PV}.tar.gz \
21 file://parallelmake.patch"
21 22
22SRC_URI[md5sum] = "db8eca3b64163abadf8c40e5cecc261f" 23SRC_URI[md5sum] = "db8eca3b64163abadf8c40e5cecc261f"
23SRC_URI[sha256sum] = "610d3ec724fbdaa654afe3cff20b9f4d504be3fd296fded2e0f7f764041006a3" 24SRC_URI[sha256sum] = "610d3ec724fbdaa654afe3cff20b9f4d504be3fd296fded2e0f7f764041006a3"
24 25
25PR = "r1" 26PR = "r2"
26 27
27inherit autotools 28inherit autotools
28BBCLASSEXTEND = "native nativesdk" 29BBCLASSEXTEND = "native nativesdk"