diff options
author | Juro Bystricky <juro.bystricky@intel.com> | 2017-03-31 14:28:13 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-04-01 23:28:19 +0100 |
commit | 7d369d794a30d21b1b2f08872130d52bba945d76 (patch) | |
tree | 7723a4a06f38ec3de2a02004ba27e1d1afb0b7d2 /meta | |
parent | 1771bfd1a78b800d707963707c687fce63684136 (diff) | |
download | poky-7d369d794a30d21b1b2f08872130d52bba945d76.tar.gz |
ncurses_6.0: Improve reproducibility
Build static libraries without the binutils "ar" -U option.
This option deliberately breaks deterministic mode.
The option seems to be a relic from 2015, intended as a workaround
for some unspecified build problems.
[YOCTO#11247]
(From OE-Core rev: 46c757d0ca7ff294a7e55c130698fd256b69b62e)
Signed-off-by: Juro Bystricky <juro.bystricky@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-core/ncurses/files/configure-reproducible.patch | 20 | ||||
-rw-r--r-- | meta/recipes-core/ncurses/ncurses_6.0+20161126.bb | 1 |
2 files changed, 21 insertions, 0 deletions
diff --git a/meta/recipes-core/ncurses/files/configure-reproducible.patch b/meta/recipes-core/ncurses/files/configure-reproducible.patch new file mode 100644 index 0000000000..54a8bdc6b8 --- /dev/null +++ b/meta/recipes-core/ncurses/files/configure-reproducible.patch | |||
@@ -0,0 +1,20 @@ | |||
1 | "configure" enforces -U for ar flags, breaking deterministic builds. | ||
2 | The flag was added to fix some vaguely specified "recent POSIX binutil | ||
3 | build problems" in 2015. | ||
4 | |||
5 | Upstream-Status: Pending | ||
6 | Signed-off-by: Juro Bystricky <juro.bystricky@intel.com> | ||
7 | |||
8 | diff --git a/configure b/configure | ||
9 | index 7f31208..aa80911 100755 | ||
10 | --- a/configure | ||
11 | +++ b/configure | ||
12 | @@ -4428,7 +4428,7 @@ if test "${cf_cv_ar_flags+set}" = set; then | ||
13 | else | ||
14 | |||
15 | cf_cv_ar_flags=unknown | ||
16 | - for cf_ar_flags in -curvU -curv curv -crv crv -cqv cqv -rv rv | ||
17 | + for cf_ar_flags in -curv curv -crv crv -cqv cqv -rv rv | ||
18 | do | ||
19 | |||
20 | # check if $ARFLAGS already contains this choice | ||
diff --git a/meta/recipes-core/ncurses/ncurses_6.0+20161126.bb b/meta/recipes-core/ncurses/ncurses_6.0+20161126.bb index e95741f4c3..ace3108007 100644 --- a/meta/recipes-core/ncurses/ncurses_6.0+20161126.bb +++ b/meta/recipes-core/ncurses/ncurses_6.0+20161126.bb | |||
@@ -3,6 +3,7 @@ require ncurses.inc | |||
3 | SRC_URI += "file://tic-hang.patch \ | 3 | SRC_URI += "file://tic-hang.patch \ |
4 | file://fix-cflags-mangle.patch \ | 4 | file://fix-cflags-mangle.patch \ |
5 | file://config.cache \ | 5 | file://config.cache \ |
6 | file://configure-reproducible.patch \ | ||
6 | " | 7 | " |
7 | # commit id corresponds to the revision in package version | 8 | # commit id corresponds to the revision in package version |
8 | SRCREV = "3db0bd19cb50e3d9b4f2cf15b7a102fe11302068" | 9 | SRCREV = "3db0bd19cb50e3d9b4f2cf15b7a102fe11302068" |