diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2021-10-27 11:07:25 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-10-28 14:16:31 +0100 |
commit | 72cc10c929b11cc1ed17f5820ca7a63a40d0eec1 (patch) | |
tree | 3479ff8b4d63109b7e7eb85ab41b4055dcedf451 /meta/recipes-core/ncurses | |
parent | f1c9341c2986b4ba1bb60508277b11cec909ad13 (diff) | |
download | poky-72cc10c929b11cc1ed17f5820ca7a63a40d0eec1.tar.gz |
ncurses: update 6.2 -> 6.3
(From OE-Core rev: db7666551ee1f0e0cf63a36ea24babe986e36713)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/ncurses')
-rw-r--r-- | meta/recipes-core/ncurses/files/0002-configure-reproducible.patch | 26 | ||||
-rw-r--r-- | meta/recipes-core/ncurses/files/0003-gen-pkgconfig.in-Do-not-include-LDFLAGS-in-generated.patch | 9 | ||||
-rw-r--r-- | meta/recipes-core/ncurses/ncurses_6.3.bb (renamed from meta/recipes-core/ncurses/ncurses_6.2.bb) | 2 |
3 files changed, 18 insertions, 19 deletions
diff --git a/meta/recipes-core/ncurses/files/0002-configure-reproducible.patch b/meta/recipes-core/ncurses/files/0002-configure-reproducible.patch index 572195611e..66f26c06ab 100644 --- a/meta/recipes-core/ncurses/files/0002-configure-reproducible.patch +++ b/meta/recipes-core/ncurses/files/0002-configure-reproducible.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 2a53c03ffa90f0050a949fc5920f0df3e668ff42 Mon Sep 17 00:00:00 2001 | 1 | From ec87e53066a9942e9aaba817d71268342f5e83b9 Mon Sep 17 00:00:00 2001 |
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
3 | Date: Wed, 16 Aug 2017 14:45:27 +0800 | 3 | Date: Wed, 16 Aug 2017 14:45:27 +0800 |
4 | Subject: [PATCH 2/2] configure: reproducible | 4 | Subject: [PATCH] configure: reproducible |
5 | 5 | ||
6 | "configure" enforces -U for ar flags, breaking deterministic builds. | 6 | "configure" enforces -U for ar flags, breaking deterministic builds. |
7 | The flag was added to fix some vaguely specified "recent POSIX binutil | 7 | The flag was added to fix some vaguely specified "recent POSIX binutil |
@@ -13,23 +13,21 @@ Signed-off-by: Juro Bystricky <juro.bystricky@intel.com> | |||
13 | Rebase to 6.1 | 13 | Rebase to 6.1 |
14 | 14 | ||
15 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | 15 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
16 | |||
16 | --- | 17 | --- |
17 | configure | 2 +- | 18 | configure | 2 +- |
18 | 1 file changed, 1 insertion(+), 1 deletion(-) | 19 | 1 file changed, 1 insertion(+), 1 deletion(-) |
19 | 20 | ||
20 | diff --git a/configure b/configure | 21 | diff --git a/configure b/configure |
21 | index adead92..fa4fdb7 100755 | 22 | index 421cf859..a1b7840d 100755 |
22 | --- a/configure | 23 | --- a/configure |
23 | +++ b/configure | 24 | +++ b/configure |
24 | @@ -4503,7 +4503,7 @@ if test "${cf_cv_ar_flags+set}" = set; then | 25 | @@ -5072,7 +5072,7 @@ else |
25 | else | 26 | ;; |
26 | 27 | (*) | |
27 | cf_cv_ar_flags=unknown | 28 | cf_cv_ar_flags=unknown |
28 | - for cf_ar_flags in -curvU -curv curv -crv crv -cqv cqv -rv rv | 29 | - for cf_ar_flags in -curvU -curv curv -crv crv -cqv cqv -rv rv |
29 | + for cf_ar_flags in -curv curv -crv crv -cqv cqv -rv rv | 30 | + for cf_ar_flags in -curv curv -crv crv -cqv cqv -rv rv |
30 | do | 31 | do |
31 | 32 | ||
32 | # check if $ARFLAGS already contains this choice | 33 | # check if $ARFLAGS already contains this choice |
33 | -- | ||
34 | 1.8.3.1 | ||
35 | |||
diff --git a/meta/recipes-core/ncurses/files/0003-gen-pkgconfig.in-Do-not-include-LDFLAGS-in-generated.patch b/meta/recipes-core/ncurses/files/0003-gen-pkgconfig.in-Do-not-include-LDFLAGS-in-generated.patch index 1eb17767a0..a15694d4d4 100644 --- a/meta/recipes-core/ncurses/files/0003-gen-pkgconfig.in-Do-not-include-LDFLAGS-in-generated.patch +++ b/meta/recipes-core/ncurses/files/0003-gen-pkgconfig.in-Do-not-include-LDFLAGS-in-generated.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 3b3e87934bb6d8511261d7c3d6e39b4f71849272 Mon Sep 17 00:00:00 2001 | 1 | From 10cd0c12a6e14fb4f0498c299c1dd32720b710da Mon Sep 17 00:00:00 2001 |
2 | From: Nathan Rossi <nathan@nathanrossi.com> | 2 | From: Nathan Rossi <nathan@nathanrossi.com> |
3 | Date: Mon, 14 Dec 2020 13:39:02 +1000 | 3 | Date: Mon, 14 Dec 2020 13:39:02 +1000 |
4 | Subject: [PATCH] gen-pkgconfig.in: Do not include LDFLAGS in generated pc | 4 | Subject: [PATCH] gen-pkgconfig.in: Do not include LDFLAGS in generated pc |
@@ -10,19 +10,20 @@ includes build host specific paths and options (e.g. uninative and | |||
10 | 10 | ||
11 | Upstream-Status: Inappropriate [OE Specific] | 11 | Upstream-Status: Inappropriate [OE Specific] |
12 | Signed-off-by: Nathan Rossi <nathan@nathanrossi.com> | 12 | Signed-off-by: Nathan Rossi <nathan@nathanrossi.com> |
13 | |||
13 | --- | 14 | --- |
14 | misc/gen-pkgconfig.in | 2 +- | 15 | misc/gen-pkgconfig.in | 2 +- |
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | 16 | 1 file changed, 1 insertion(+), 1 deletion(-) |
16 | 17 | ||
17 | diff --git a/misc/gen-pkgconfig.in b/misc/gen-pkgconfig.in | 18 | diff --git a/misc/gen-pkgconfig.in b/misc/gen-pkgconfig.in |
18 | index 8f00b824b9..009d215663 100644 | 19 | index a45dd54f..85273054 100644 |
19 | --- a/misc/gen-pkgconfig.in | 20 | --- a/misc/gen-pkgconfig.in |
20 | +++ b/misc/gen-pkgconfig.in | 21 | +++ b/misc/gen-pkgconfig.in |
21 | @@ -80,7 +80,7 @@ if [ "$includedir" != "/usr/include" ]; then | 22 | @@ -83,7 +83,7 @@ if [ "$includedir" != "/usr/include" ]; then |
22 | fi | 23 | fi |
23 | 24 | ||
24 | lib_flags= | 25 | lib_flags= |
25 | -for opt in -L$libdir @LDFLAGS@ @EXTRA_LDFLAGS@ @LIBS@ | 26 | -for opt in -L$libdir @EXTRA_PKG_LDFLAGS@ @LIBS@ |
26 | +for opt in -L$libdir @LIBS@ | 27 | +for opt in -L$libdir @LIBS@ |
27 | do | 28 | do |
28 | case $opt in | 29 | case $opt in |
diff --git a/meta/recipes-core/ncurses/ncurses_6.2.bb b/meta/recipes-core/ncurses/ncurses_6.3.bb index e7d7396a20..f0256dad22 100644 --- a/meta/recipes-core/ncurses/ncurses_6.2.bb +++ b/meta/recipes-core/ncurses/ncurses_6.3.bb | |||
@@ -5,7 +5,7 @@ SRC_URI += "file://0001-tic-hang.patch \ | |||
5 | file://0003-gen-pkgconfig.in-Do-not-include-LDFLAGS-in-generated.patch \ | 5 | file://0003-gen-pkgconfig.in-Do-not-include-LDFLAGS-in-generated.patch \ |
6 | " | 6 | " |
7 | # commit id corresponds to the revision in package version | 7 | # commit id corresponds to the revision in package version |
8 | SRCREV = "a669013cd5e9d6434e5301348ea51baf306c93c4" | 8 | SRCREV = "51d0fd9cc3edb975f04224f29f777f8f448e8ced" |
9 | S = "${WORKDIR}/git" | 9 | S = "${WORKDIR}/git" |
10 | EXTRA_OECONF += "--with-abi-version=5" | 10 | EXTRA_OECONF += "--with-abi-version=5" |
11 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)$" | 11 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)$" |