diff options
Diffstat (limited to 'external/poky/meta/recipes-core/ncurses')
3 files changed, 18 insertions, 14 deletions
diff --git a/external/poky/meta/recipes-core/ncurses/ncurses.inc b/external/poky/meta/recipes-core/ncurses/ncurses.inc index 99fc4786..4156bf4f 100644 --- a/external/poky/meta/recipes-core/ncurses/ncurses.inc +++ b/external/poky/meta/recipes-core/ncurses/ncurses.inc @@ -2,7 +2,7 @@ SUMMARY = "The New Curses library" 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." HOMEPAGE = "http://www.gnu.org/software/ncurses/ncurses.html" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://ncurses/base/version.c;beginline=1;endline=27;md5=cbc180a8c44ca642e97c35452fab5f66" +LIC_FILES_CHKSUM = "file://ncurses/base/version.c;beginline=1;endline=27;md5=5526f2f3a29edc95538b368a4771edda" SECTION = "libs" DEPENDS = "ncurses-native" DEPENDS_class-native = "" @@ -87,6 +87,7 @@ ncurses_configure() { --disable-rpath-hack \ ${EXCONFIG_ARGS} \ --with-manpage-format=normal \ + --without-manpage-renames \ --disable-stripping \ "$@" || return 1 cd .. @@ -260,9 +261,9 @@ python populate_packages_prepend () { libdir = d.expand("${libdir}") base_libdir = d.expand("${base_libdir}") pnbase = d.expand("${PN}-lib%s") - do_split_packages(d, libdir, '^lib(.*)\.so\..*', pnbase, 'ncurses %s library', prepend=True, extra_depends = '', allow_links=True) + do_split_packages(d, libdir, r'^lib(.*)\.so\..*', pnbase, 'ncurses %s library', prepend=True, extra_depends = '', allow_links=True) if libdir is not base_libdir: - do_split_packages(d, base_libdir, '^lib(.*)\.so\..*', pnbase, 'ncurses %s library', prepend=True, extra_depends = '', allow_links=True) + do_split_packages(d, base_libdir, r'^lib(.*)\.so\..*', pnbase, 'ncurses %s library', prepend=True, extra_depends = '', allow_links=True) } diff --git a/external/poky/meta/recipes-core/ncurses/ncurses_6.1+20180630.bb b/external/poky/meta/recipes-core/ncurses/ncurses_6.1+20180630.bb deleted file mode 100644 index 38faf7af..00000000 --- a/external/poky/meta/recipes-core/ncurses/ncurses_6.1+20180630.bb +++ /dev/null @@ -1,11 +0,0 @@ -require ncurses.inc - -SRC_URI += "file://0001-tic-hang.patch \ - file://0002-configure-reproducible.patch \ - file://config.cache \ -" -# commit id corresponds to the revision in package version -SRCREV = "d3b29180ae4360d7ab7a41a15e963299fdb72e33" -S = "${WORKDIR}/git" -EXTRA_OECONF += "--with-abi-version=5" -UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+(\+\d+)*)" diff --git a/external/poky/meta/recipes-core/ncurses/ncurses_6.2.bb b/external/poky/meta/recipes-core/ncurses/ncurses_6.2.bb new file mode 100644 index 00000000..723e685a --- /dev/null +++ b/external/poky/meta/recipes-core/ncurses/ncurses_6.2.bb @@ -0,0 +1,14 @@ +require ncurses.inc + +SRC_URI += "file://0001-tic-hang.patch \ + file://0002-configure-reproducible.patch \ + file://config.cache \ + " +# commit id corresponds to the revision in package version +SRCREV = "a669013cd5e9d6434e5301348ea51baf306c93c4" +S = "${WORKDIR}/git" +EXTRA_OECONF += "--with-abi-version=5 --cache-file=${B}/config.cache" +UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+(\+\d+)*)" + +# This is needed when using patchlevel versions like 6.1+20181013 +#CVE_VERSION = "${@d.getVar("PV").split('+')[0]}.${@d.getVar("PV").split('+')[1]}" |