diff options
Diffstat (limited to 'meta/recipes-core/ncurses')
-rw-r--r-- | meta/recipes-core/ncurses/files/0001-tic-hang.patch | 11 | ||||
-rw-r--r-- | meta/recipes-core/ncurses/files/0002-configure-reproducible.patch | 25 | ||||
-rw-r--r-- | meta/recipes-core/ncurses/files/0003-gen-pkgconfig.in-Do-not-include-LDFLAGS-in-generated.patch | 8 | ||||
-rw-r--r-- | meta/recipes-core/ncurses/files/exit_prototype.patch | 31 | ||||
-rw-r--r-- | meta/recipes-core/ncurses/ncurses.inc | 58 | ||||
-rw-r--r-- | meta/recipes-core/ncurses/ncurses_6.5.bb (renamed from meta/recipes-core/ncurses/ncurses_6.2.bb) | 5 |
6 files changed, 79 insertions, 59 deletions
diff --git a/meta/recipes-core/ncurses/files/0001-tic-hang.patch b/meta/recipes-core/ncurses/files/0001-tic-hang.patch index f98a943e5c..8cb92a3939 100644 --- a/meta/recipes-core/ncurses/files/0001-tic-hang.patch +++ b/meta/recipes-core/ncurses/files/0001-tic-hang.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 168ba7a681be73ac024438e33e14fde1d5aea97d Mon Sep 17 00:00:00 2001 | 1 | From a51a53f0eecfd4d083aba8dfcd47c65e93978ff1 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: Fri, 30 Mar 2018 10:02:24 +0800 | 3 | Date: Fri, 30 Mar 2018 10:02:24 +0800 |
4 | Subject: [PATCH 1/2] tic hang | 4 | Subject: [PATCH] tic hang |
5 | 5 | ||
6 | Upstream-Status: Inappropriate [configuration] | 6 | Upstream-Status: Inappropriate [configuration] |
7 | 7 | ||
@@ -17,10 +17,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | |||
17 | 1 file changed, 5 insertions(+), 6 deletions(-) | 17 | 1 file changed, 5 insertions(+), 6 deletions(-) |
18 | 18 | ||
19 | diff --git a/misc/terminfo.src b/misc/terminfo.src | 19 | diff --git a/misc/terminfo.src b/misc/terminfo.src |
20 | index 84f4810..6b385ec 100644 | 20 | index 5d575b8e..f9cc6880 100644 |
21 | --- a/misc/terminfo.src | 21 | --- a/misc/terminfo.src |
22 | +++ b/misc/terminfo.src | 22 | +++ b/misc/terminfo.src |
23 | @@ -5562,12 +5562,11 @@ konsole-xf3x|KDE console window with keyboard for XFree86 3.x xterm, | 23 | @@ -6518,12 +6518,11 @@ konsole-xf3x|KDE console window with keyboard for XFree86 3.x xterm, |
24 | # The value for kbs (see konsole-vt100) reflects local customization rather | 24 | # The value for kbs (see konsole-vt100) reflects local customization rather |
25 | # than the settings used for XFree86 xterm. | 25 | # than the settings used for XFree86 xterm. |
26 | konsole-xf4x|KDE console window with keyboard for XFree86 4.x xterm, | 26 | konsole-xf4x|KDE console window with keyboard for XFree86 4.x xterm, |
@@ -38,6 +38,3 @@ index 84f4810..6b385ec 100644 | |||
38 | 38 | ||
39 | # Obsolete: vt100.keymap | 39 | # Obsolete: vt100.keymap |
40 | # KDE's "vt100" keyboard has no relationship to any terminal that DEC made, but | 40 | # KDE's "vt100" keyboard has no relationship to any terminal that DEC made, but |
41 | -- | ||
42 | 1.8.3.1 | ||
43 | |||
diff --git a/meta/recipes-core/ncurses/files/0002-configure-reproducible.patch b/meta/recipes-core/ncurses/files/0002-configure-reproducible.patch index 572195611e..11ca66c8e8 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 63cf58044f4ab3297c5a2d0e132e87ebfa80c753 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 |
@@ -18,18 +18,15 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | |||
18 | 1 file changed, 1 insertion(+), 1 deletion(-) | 18 | 1 file changed, 1 insertion(+), 1 deletion(-) |
19 | 19 | ||
20 | diff --git a/configure b/configure | 20 | diff --git a/configure b/configure |
21 | index adead92..fa4fdb7 100755 | 21 | index 488d93fc..005d44e2 100755 |
22 | --- a/configure | 22 | --- a/configure |
23 | +++ b/configure | 23 | +++ b/configure |
24 | @@ -4503,7 +4503,7 @@ if test "${cf_cv_ar_flags+set}" = set; then | 24 | @@ -5129,7 +5129,7 @@ else |
25 | else | 25 | ;; |
26 | (*) | ||
27 | 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 -curv curv -crv crv -cqv cqv -rv rv | ||
30 | do | ||
26 | 31 | ||
27 | cf_cv_ar_flags=unknown | 32 | # check if $ARFLAGS already contains this choice |
28 | - 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 | do | ||
31 | |||
32 | # 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..d89399bbe5 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 5962a5ee2885f67a396f7e8955ac1bbd7f15d4aa 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 |
@@ -15,14 +15,14 @@ Signed-off-by: Nathan Rossi <nathan@nathanrossi.com> | |||
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | 15 | 1 file changed, 1 insertion(+), 1 deletion(-) |
16 | 16 | ||
17 | diff --git a/misc/gen-pkgconfig.in b/misc/gen-pkgconfig.in | 17 | diff --git a/misc/gen-pkgconfig.in b/misc/gen-pkgconfig.in |
18 | index 8f00b824b9..009d215663 100644 | 18 | index 89a5cd4a..07d94d17 100644 |
19 | --- a/misc/gen-pkgconfig.in | 19 | --- a/misc/gen-pkgconfig.in |
20 | +++ b/misc/gen-pkgconfig.in | 20 | +++ b/misc/gen-pkgconfig.in |
21 | @@ -80,7 +80,7 @@ if [ "$includedir" != "/usr/include" ]; then | 21 | @@ -83,7 +83,7 @@ if [ "$includedir" != "/usr/include" ]; then |
22 | fi | 22 | fi |
23 | 23 | ||
24 | lib_flags= | 24 | lib_flags= |
25 | -for opt in -L$libdir @LDFLAGS@ @EXTRA_LDFLAGS@ @LIBS@ | 25 | -for opt in -L$libdir @EXTRA_PKG_LDFLAGS@ @LIBS@ |
26 | +for opt in -L$libdir @LIBS@ | 26 | +for opt in -L$libdir @LIBS@ |
27 | do | 27 | do |
28 | case $opt in | 28 | case $opt in |
diff --git a/meta/recipes-core/ncurses/files/exit_prototype.patch b/meta/recipes-core/ncurses/files/exit_prototype.patch new file mode 100644 index 0000000000..299852d2c0 --- /dev/null +++ b/meta/recipes-core/ncurses/files/exit_prototype.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | From af798dceafec8a9ea3f83fc250d784511ca0a29c Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 30 Aug 2022 15:58:32 -0700 | ||
4 | Subject: [PATCH] Add needed headers for including mbstate_t and exit() | ||
5 | |||
6 | Upstream-Status: Inappropriate [Reconfigure will solve it] | ||
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
8 | --- | ||
9 | configure | 2 ++ | ||
10 | 1 file changed, 2 insertions(+) | ||
11 | |||
12 | diff --git a/configure b/configure | ||
13 | index 005d44e2..72fa6c23 100755 | ||
14 | --- a/configure | ||
15 | +++ b/configure | ||
16 | @@ -3462,6 +3462,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" | ||
17 | cat >"conftest.$ac_ext" <<_ACEOF | ||
18 | #line 3463 "configure" | ||
19 | #include "confdefs.h" | ||
20 | +#include <stdlib.h> | ||
21 | $ac_declaration | ||
22 | int | ||
23 | main (void) | ||
24 | @@ -13533,6 +13534,7 @@ cat >"conftest.$ac_ext" <<_ACEOF | ||
25 | #include <stdlib.h> | ||
26 | #include <stdarg.h> | ||
27 | #include <stdio.h> | ||
28 | +#include <wchar.h> | ||
29 | #ifdef HAVE_LIBUTF8_H | ||
30 | #include <libutf8.h> | ||
31 | #endif | ||
diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc index ef59bc3b0a..2a3fd4f2c5 100644 --- a/meta/recipes-core/ncurses/ncurses.inc +++ b/meta/recipes-core/ncurses/ncurses.inc | |||
@@ -2,10 +2,10 @@ SUMMARY = "The New Curses library" | |||
2 | DESCRIPTION = "SVr4 and XSI-Curses compatible curses library and terminfo tools including tic, infocmp, captoinfo. Supports color, multiple highlights, forms-drawing characters, and automatic recognition of keypad and function-key sequences. Extensions include resizable windows and mouse support on both xterm and Linux console using the gpm library." | 2 | DESCRIPTION = "SVr4 and XSI-Curses compatible curses library and terminfo tools including tic, infocmp, captoinfo. Supports color, multiple highlights, forms-drawing characters, and automatic recognition of keypad and function-key sequences. Extensions include resizable windows and mouse support on both xterm and Linux console using the gpm library." |
3 | HOMEPAGE = "http://www.gnu.org/software/ncurses/ncurses.html" | 3 | HOMEPAGE = "http://www.gnu.org/software/ncurses/ncurses.html" |
4 | LICENSE = "MIT" | 4 | LICENSE = "MIT" |
5 | LIC_FILES_CHKSUM = "file://ncurses/base/version.c;beginline=1;endline=27;md5=5526f2f3a29edc95538b368a4771edda" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=6f291ee54551d9d8d992ecd623fe4bc7;endline=27" |
6 | SECTION = "libs" | 6 | SECTION = "libs" |
7 | DEPENDS = "ncurses-native" | 7 | DEPENDS = "ncurses-native" |
8 | DEPENDS_class-native = "" | 8 | DEPENDS:class-native = "" |
9 | 9 | ||
10 | BINCONFIG = "${bindir}/ncurses5-config ${bindir}/ncursesw5-config \ | 10 | BINCONFIG = "${bindir}/ncurses5-config ${bindir}/ncursesw5-config \ |
11 | ${bindir}/ncurses6-config ${bindir}/ncursesw6-config" | 11 | ${bindir}/ncurses6-config ${bindir}/ncursesw6-config" |
@@ -13,11 +13,12 @@ BINCONFIG = "${bindir}/ncurses5-config ${bindir}/ncursesw5-config \ | |||
13 | inherit autotools binconfig-disabled multilib_header pkgconfig | 13 | inherit autotools binconfig-disabled multilib_header pkgconfig |
14 | 14 | ||
15 | # Upstream has useful patches at times at ftp://invisible-island.net/ncurses/ | 15 | # Upstream has useful patches at times at ftp://invisible-island.net/ncurses/ |
16 | SRC_URI = "git://salsa.debian.org/debian/ncurses.git;protocol=https" | 16 | SRC_URI = "git://github.com/ThomasDickey/ncurses-snapshots.git;protocol=https;branch=master" |
17 | 17 | ||
18 | EXTRA_AUTORECONF = "-I m4" | 18 | EXTRA_AUTORECONF = "-I m4" |
19 | 19 | ||
20 | CACHED_CONFIGUREVARS = "cf_cv_func_nanosleep=yes" | 20 | CACHED_CONFIGUREVARS = "cf_cv_func_nanosleep=yes" |
21 | CACHED_CONFIGUREVARS:append:linux = " cf_cv_working_poll=yes" | ||
21 | 22 | ||
22 | EXTRASITECONFIG = "CFLAGS='${CFLAGS} -I${SYSROOT_DESTDIR}${includedir}'" | 23 | EXTRASITECONFIG = "CFLAGS='${CFLAGS} -I${SYSROOT_DESTDIR}${includedir}'" |
23 | 24 | ||
@@ -26,23 +27,21 @@ EXTRASITECONFIG = "CFLAGS='${CFLAGS} -I${SYSROOT_DESTDIR}${includedir}'" | |||
26 | # TODO: remove this variable when widec is supported in every setup? | 27 | # TODO: remove this variable when widec is supported in every setup? |
27 | ENABLE_WIDEC ?= "true" | 28 | ENABLE_WIDEC ?= "true" |
28 | 29 | ||
29 | # _GNU_SOURCE is required for widec stuff and is detected automatically | 30 | # _GNU_SOURCE is required for widec stuff and is not detected automatically |
30 | # for target objects. But it must be set manually for native and sdk | 31 | CPPFLAGS += "-D_GNU_SOURCE" |
31 | # builds. | ||
32 | BUILD_CPPFLAGS += "-D_GNU_SOURCE" | ||
33 | 32 | ||
34 | # natives don't generally look in base_libdir | 33 | # natives don't generally look in base_libdir |
35 | base_libdir_class-native = "${libdir}" | 34 | base_libdir:class-native = "${libdir}" |
36 | 35 | ||
37 | # Display corruption occurs on 64 bit hosts without these settings | 36 | # Display corruption occurs on 64 bit hosts without these settings |
38 | # This was derrived from the upstream debian ncurses which uses | 37 | # This was derrived from the upstream debian ncurses which uses |
39 | # these settings for 32 and 64 bit hosts. | 38 | # these settings for 32 and 64 bit hosts. |
40 | EXCONFIG_ARGS = "" | 39 | EXCONFIG_ARGS = "" |
41 | EXCONFIG_ARGS_class-native = " \ | 40 | EXCONFIG_ARGS:class-native = " \ |
42 | --disable-lp64 \ | 41 | --disable-lp64 \ |
43 | --with-chtype='long' \ | 42 | --with-chtype='long' \ |
44 | --with-mmask-t='long'" | 43 | --with-mmask-t='long'" |
45 | EXCONFIG_ARGS_class-nativesdk = " \ | 44 | EXCONFIG_ARGS:class-nativesdk = " \ |
46 | --disable-lp64 \ | 45 | --disable-lp64 \ |
47 | --with-chtype='long' \ | 46 | --with-chtype='long' \ |
48 | --with-mmask-t='long'" | 47 | --with-mmask-t='long'" |
@@ -55,11 +54,11 @@ PACKAGES_DYNAMIC = "^${PN}-lib.*" | |||
55 | # because the sstate had a hard coded search path. Until this is fixed | 54 | # because the sstate had a hard coded search path. Until this is fixed |
56 | # another way this is deemed good enough. | 55 | # another way this is deemed good enough. |
57 | EX_TERMCAP = "" | 56 | EX_TERMCAP = "" |
58 | EX_TERMCAP_class-native = ":/etc/termcap:/usr/share/misc/termcap" | 57 | EX_TERMCAP:class-native = ":/etc/termcap:/usr/share/misc/termcap" |
59 | EX_TERMCAP_class-nativesdk = ":/etc/termcap:/usr/share/misc/termcap" | 58 | EX_TERMCAP:class-nativesdk = ":/etc/termcap:/usr/share/misc/termcap" |
60 | EX_TERMINFO = "" | 59 | EX_TERMINFO = "" |
61 | EX_TERMINFO_class-native = ":/etc/terminfo:/usr/share/terminfo:/usr/share/misc/terminfo:/lib/terminfo" | 60 | EX_TERMINFO:class-native = ":/etc/terminfo:/usr/share/terminfo:/usr/share/misc/terminfo:/lib/terminfo" |
62 | EX_TERMINFO_class-nativesdk = ":/etc/terminfo:/usr/share/terminfo:/usr/share/misc/terminfo:/lib/terminfo" | 61 | EX_TERMINFO:class-nativesdk = ":/etc/terminfo:/usr/share/terminfo:/usr/share/misc/terminfo:/lib/terminfo" |
63 | EX_TERMLIB ?= "tinfo" | 62 | EX_TERMLIB ?= "tinfo" |
64 | 63 | ||
65 | # Helper function for do_configure to allow multiple configurations | 64 | # Helper function for do_configure to allow multiple configurations |
@@ -98,10 +97,6 @@ ncurses_configure() { | |||
98 | # patched autoconf213 to generate the configure script. This autoconf | 97 | # patched autoconf213 to generate the configure script. This autoconf |
99 | # is not available so that the shipped script will be used. | 98 | # is not available so that the shipped script will be used. |
100 | do_configure() { | 99 | do_configure() { |
101 | # check does not work with cross-compiling and is generally | ||
102 | # broken because it requires stdin to be pollable (which is | ||
103 | # not the case for /dev/null redirections) | ||
104 | export cf_cv_working_poll=yes | ||
105 | #Remove ${includedir} from CPPFLAGS, need for cross compile | 100 | #Remove ${includedir} from CPPFLAGS, need for cross compile |
106 | sed -i 's#-I${cf_includedir}##g' ${S}/configure || die "sed CPPFLAGS" | 101 | sed -i 's#-I${cf_includedir}##g' ${S}/configure || die "sed CPPFLAGS" |
107 | 102 | ||
@@ -242,10 +237,9 @@ do_install() { | |||
242 | mv ${D}${libdir}/libtinfo.so.* ${D}${base_libdir} | 237 | mv ${D}${libdir}/libtinfo.so.* ${D}${base_libdir} |
243 | rm ${D}${libdir}/libtinfo.so | 238 | rm ${D}${libdir}/libtinfo.so |
244 | 239 | ||
245 | # Use lnr to ensure this is a relative link despite absolute paths | 240 | # Use ln -rs to ensure this is a relative link despite absolute paths |
246 | # (as we can't know the relationship between base_libdir and libdir). | 241 | # (as we can't know the relationship between base_libdir and libdir). |
247 | # At some point we can rely on coreutils 8.16 which has ln -r. | 242 | ln -rs ${D}${base_libdir}/libtinfo.so.5 ${D}${libdir}/libtinfo.so |
248 | lnr ${D}${base_libdir}/libtinfo.so.5 ${D}${libdir}/libtinfo.so | ||
249 | fi | 243 | fi |
250 | if [ -d "${D}${includedir}/ncurses" ]; then | 244 | if [ -d "${D}${includedir}/ncurses" ]; then |
251 | for f in `find ${D}${includedir}/ncurses -name "*.h"` | 245 | for f in `find ${D}${includedir}/ncurses -name "*.h"` |
@@ -258,7 +252,7 @@ do_install() { | |||
258 | oe_multilib_header curses.h | 252 | oe_multilib_header curses.h |
259 | } | 253 | } |
260 | 254 | ||
261 | python populate_packages_prepend () { | 255 | python populate_packages:prepend () { |
262 | libdir = d.expand("${libdir}") | 256 | libdir = d.expand("${libdir}") |
263 | base_libdir = d.expand("${base_libdir}") | 257 | base_libdir = d.expand("${base_libdir}") |
264 | pnbase = d.expand("${PN}-lib%s") | 258 | pnbase = d.expand("${PN}-lib%s") |
@@ -272,8 +266,8 @@ inherit update-alternatives | |||
272 | 266 | ||
273 | ALTERNATIVE_PRIORITY = "100" | 267 | ALTERNATIVE_PRIORITY = "100" |
274 | 268 | ||
275 | ALTERNATIVE_ncurses-tools_class-target = "clear reset" | 269 | ALTERNATIVE:ncurses-tools:class-target = "clear reset" |
276 | ALTERNATIVE_ncurses-terminfo_class-target = "st st-256color" | 270 | ALTERNATIVE:ncurses-terminfo:class-target = "st st-256color" |
277 | 271 | ||
278 | ALTERNATIVE_LINK_NAME[st] = "${datadir}/terminfo/s/st" | 272 | ALTERNATIVE_LINK_NAME[st] = "${datadir}/terminfo/s/st" |
279 | 273 | ||
@@ -287,7 +281,7 @@ PACKAGES += " \ | |||
287 | ${PN}-terminfo \ | 281 | ${PN}-terminfo \ |
288 | " | 282 | " |
289 | 283 | ||
290 | FILES_${PN} = "\ | 284 | FILES:${PN} = "\ |
291 | ${bindir}/tput \ | 285 | ${bindir}/tput \ |
292 | ${bindir}/tset \ | 286 | ${bindir}/tset \ |
293 | ${bindir}/ncurses5-config \ | 287 | ${bindir}/ncurses5-config \ |
@@ -299,7 +293,7 @@ FILES_${PN} = "\ | |||
299 | 293 | ||
300 | # This keeps only tput/tset in ncurses | 294 | # This keeps only tput/tset in ncurses |
301 | # clear/reset are in already busybox | 295 | # clear/reset are in already busybox |
302 | FILES_${PN}-tools = "\ | 296 | FILES:${PN}-tools = "\ |
303 | ${bindir}/tic \ | 297 | ${bindir}/tic \ |
304 | ${bindir}/toe \ | 298 | ${bindir}/toe \ |
305 | ${bindir}/infotocap \ | 299 | ${bindir}/infotocap \ |
@@ -312,20 +306,20 @@ FILES_${PN}-tools = "\ | |||
312 | " | 306 | " |
313 | 307 | ||
314 | # 'reset' is a symlink to 'tset' which is in the 'ncurses' package | 308 | # 'reset' is a symlink to 'tset' which is in the 'ncurses' package |
315 | RDEPENDS_${PN}-tools = "${PN} ${PN}-terminfo-base" | 309 | RDEPENDS:${PN}-tools = "${PN} ${PN}-terminfo-base" |
316 | 310 | ||
317 | FILES_${PN}-terminfo = "\ | 311 | FILES:${PN}-terminfo = "\ |
318 | ${datadir}/terminfo \ | 312 | ${datadir}/terminfo \ |
319 | " | 313 | " |
320 | 314 | ||
321 | FILES_${PN}-terminfo-base = "\ | 315 | FILES:${PN}-terminfo-base = "\ |
322 | ${sysconfdir}/terminfo \ | 316 | ${sysconfdir}/terminfo \ |
323 | " | 317 | " |
324 | 318 | ||
325 | RSUGGESTS_${PN}-libtinfo = "${PN}-terminfo" | 319 | RSUGGESTS:${PN}-libtinfo = "${PN}-terminfo" |
326 | RRECOMMENDS_${PN}-libtinfo = "${PN}-terminfo-base" | 320 | RRECOMMENDS:${PN}-libtinfo = "${PN}-terminfo-base" |
327 | 321 | ||
328 | # Putting terminfo into the sysroot adds around 2800 files to | 322 | # Putting terminfo into the sysroot adds around 2800 files to |
329 | # each recipe specific sysroot. We can live without this, particularly | 323 | # each recipe specific sysroot. We can live without this, particularly |
330 | # as many recipes may have native and target copies. | 324 | # as many recipes may have native and target copies. |
331 | SYSROOT_DIRS_remove = "${datadir}" | 325 | SYSROOT_DIRS:remove = "${datadir}" |
diff --git a/meta/recipes-core/ncurses/ncurses_6.2.bb b/meta/recipes-core/ncurses/ncurses_6.5.bb index e7d7396a20..2e3ee337ea 100644 --- a/meta/recipes-core/ncurses/ncurses_6.2.bb +++ b/meta/recipes-core/ncurses/ncurses_6.5.bb | |||
@@ -3,12 +3,13 @@ require ncurses.inc | |||
3 | SRC_URI += "file://0001-tic-hang.patch \ | 3 | SRC_URI += "file://0001-tic-hang.patch \ |
4 | file://0002-configure-reproducible.patch \ | 4 | file://0002-configure-reproducible.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 | file://exit_prototype.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 = "a669013cd5e9d6434e5301348ea51baf306c93c4" | 9 | SRCREV = "1c55d64d9d3e00399a21f04e9cac1e472ab5f70a" |
9 | S = "${WORKDIR}/git" | 10 | S = "${WORKDIR}/git" |
10 | EXTRA_OECONF += "--with-abi-version=5" | 11 | EXTRA_OECONF += "--with-abi-version=5" |
11 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)$" | 12 | UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+_\d+)$" |
12 | 13 | ||
13 | # This is needed when using patchlevel versions like 6.1+20181013 | 14 | # This is needed when using patchlevel versions like 6.1+20181013 |
14 | #CVE_VERSION = "${@d.getVar("PV").split('+')[0]}.${@d.getVar("PV").split('+')[1]}" | 15 | #CVE_VERSION = "${@d.getVar("PV").split('+')[0]}.${@d.getVar("PV").split('+')[1]}" |