From a3df0aa78af1c2fecf847e87cc480fd2ed9afe89 Mon Sep 17 00:00:00 2001 From: Juro Bystricky Date: Thu, 10 Mar 2016 18:07:36 -0800 Subject: ncurses_6: Fix an install race condition Both targets install.libs and install.includes install the same files, resulting in a race condition when running parallel make. This race is addressed in a patch file, making sure only one of the targets (install.includes) installes the include files. This will work properly (i.e.ncurses will install as intended by the recipe) as long as we always install both targets. Signed-off-by: Juro Bystricky Signed-off-by: Richard Purdie --- .../ncurses/files/fix-include-files-race.patch | 32 ++++++++++++++++++++++ meta/recipes-core/ncurses/ncurses_6.0+20160213.bb | 1 + 2 files changed, 33 insertions(+) create mode 100644 meta/recipes-core/ncurses/files/fix-include-files-race.patch (limited to 'meta/recipes-core/ncurses') diff --git a/meta/recipes-core/ncurses/files/fix-include-files-race.patch b/meta/recipes-core/ncurses/files/fix-include-files-race.patch new file mode 100644 index 0000000000..6f22e98332 --- /dev/null +++ b/meta/recipes-core/ncurses/files/fix-include-files-race.patch @@ -0,0 +1,32 @@ +There is a race condition when running + + $ make install.libs install.includes + +As both targets install identical files. The remedy is to either prevent +parallel make of install.libs and install.includes, or ensure only one +target installs the files. +The second approch will only work if we always install both libs and +includes (which we do). + + +Upstream-Status: Inappropriate [configuration] + +Index: git/mk-hdr.awk +=================================================================== +--- a/mk-hdr.awk ++++ b/mk-hdr.awk +@@ -73,11 +73,13 @@ BEGIN { + END { + if ( count > 0 ) + { ++ print" # patched here: Removed install.libs due the race " + print "${INCLUDEDIR} :" + print " mkdir -p $@" + print "" ++ print "install.libs :: ;" ++ print "" + print "install \\" +- print "install.libs \\" + print "install.includes :: ${AUTO_SRC} ${INCLUDEDIR} \\" + + for (i = 0; i < count - 1; ++i) { diff --git a/meta/recipes-core/ncurses/ncurses_6.0+20160213.bb b/meta/recipes-core/ncurses/ncurses_6.0+20160213.bb index 0d56481a5c..fef4e0f626 100644 --- a/meta/recipes-core/ncurses/ncurses_6.0+20160213.bb +++ b/meta/recipes-core/ncurses/ncurses_6.0+20160213.bb @@ -2,6 +2,7 @@ require ncurses.inc SRC_URI += "file://tic-hang.patch \ file://config.cache \ + file://fix-include-files-race.patch \ " # commit id corresponds to the revision in package version SRCREV = "a25949ff653ac5ae7a204381a3ebfd800feeaa01" -- cgit 1.2.3-korg