diff options
| author |   Juro Bystricky <juro.bystricky@intel.com> | 2016-03-10 18:07:36 -0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-12 22:11:46 +0000 |
| commit | 03b167d49d75bf9146db5fef29d4085eb944f090 (patch) | |
| tree | 7184c33e21e736453834424c9735b6b1e0371949 | |
| parent | 09eab6b992c9ef1885ccfd6740c95b66df7c2809 (diff) | |
| download | openembedded-core-contrib-03b167d49d75bf9146db5fef29d4085eb944f090.tar.gz | |
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.
(From OE-Core rev: a3df0aa78af1c2fecf847e87cc480fd2ed9afe89)
Signed-off-by: Juro Bystricky <juro.bystricky@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-core/ncurses/files/fix-include-files-race.patch | 32 | ||||
| -rw-r--r-- | meta/recipes-core/ncurses/ncurses_6.0+20160213.bb | 1 |
2 files changed, 33 insertions, 0 deletions
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" |