Skip to content
Snippets Groups Projects
Commit c37faea9 authored by Richard Purdie's avatar Richard Purdie
Browse files

libunistring: Fix parallel make issue


See patch header for the full description of the parallel make issue this resolves.

(From OE-Core rev: 1b576a2412647fbbf0a17e95171efdc458f4be16)

Signed-off-by: default avatarRichard Purdie <richard.purdie@linuxfoundation.org>
parent b2ae65f7
Branches
Tags 1.2_M4.rc3.1
No related merge requests found
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)' \
......@@ -17,12 +17,13 @@ LICENSE = "GPLv3&LGPLv3"
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
file://COPYING.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
SRC_URI = "${GNU_MIRROR}/libunistring/libunistring-${PV}.tar.gz"
SRC_URI = "${GNU_MIRROR}/libunistring/libunistring-${PV}.tar.gz \
file://parallelmake.patch"
SRC_URI[md5sum] = "db8eca3b64163abadf8c40e5cecc261f"
SRC_URI[sha256sum] = "610d3ec724fbdaa654afe3cff20b9f4d504be3fd296fded2e0f7f764041006a3"
PR = "r1"
PR = "r2"
inherit autotools
BBCLASSEXTEND = "native nativesdk"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment