diff options
author | Ross Burton <ross.burton@intel.com> | 2020-09-10 21:53:54 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-01-09 09:17:16 +0000 |
commit | d88212ed2cec570fdc8011bb05d9d3f61f63e4d7 (patch) | |
tree | d2f0745166386eb022eb6f99c70448a1e958a0db /meta/recipes-core | |
parent | 980415d94dad2ad0ca6f90081b02dde636f5d423 (diff) | |
download | poky-d88212ed2cec570fdc8011bb05d9d3f61f63e4d7.tar.gz |
ncurses: remove config.cache
Instead of having a config.cache that overrides the system site files,
simply set the values in CACHED_CONFIGUREVARS. We can also drop the
mkstemp check as the configure.ac assumes it works, leaving just
nanosleep.
(From OE-Core rev: d095c3f88e8a3c64e4db07c010d6cf2de373ce7f)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit c30c90e3adfa91407c37838c971e251f8482e2b8)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/ncurses/files/config.cache | 4 | ||||
-rw-r--r-- | meta/recipes-core/ncurses/ncurses.inc | 3 | ||||
-rw-r--r-- | meta/recipes-core/ncurses/ncurses_6.2.bb | 3 |
3 files changed, 3 insertions, 7 deletions
diff --git a/meta/recipes-core/ncurses/files/config.cache b/meta/recipes-core/ncurses/files/config.cache deleted file mode 100644 index 6a9217d5bb..0000000000 --- a/meta/recipes-core/ncurses/files/config.cache +++ /dev/null | |||
@@ -1,4 +0,0 @@ | |||
1 | #! /bin/sh | ||
2 | |||
3 | cf_cv_func_nanosleep=yes | ||
4 | cf_cv_func_mkstemp=yes | ||
diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc index 8c68f61d99..630c5f26d6 100644 --- a/meta/recipes-core/ncurses/ncurses.inc +++ b/meta/recipes-core/ncurses/ncurses.inc | |||
@@ -16,7 +16,8 @@ inherit autotools binconfig-disabled multilib_header pkgconfig | |||
16 | SRC_URI = "git://salsa.debian.org/debian/ncurses.git;protocol=https" | 16 | SRC_URI = "git://salsa.debian.org/debian/ncurses.git;protocol=https" |
17 | 17 | ||
18 | EXTRA_AUTORECONF = "-I m4" | 18 | EXTRA_AUTORECONF = "-I m4" |
19 | CONFIG_SITE =+ "${WORKDIR}/config.cache" | 19 | |
20 | CACHED_CONFIGUREVARS = "cf_cv_func_nanosleep=yes" | ||
20 | 21 | ||
21 | EXTRASITECONFIG = "CFLAGS='${CFLAGS} -I${SYSROOT_DESTDIR}${includedir}'" | 22 | EXTRASITECONFIG = "CFLAGS='${CFLAGS} -I${SYSROOT_DESTDIR}${includedir}'" |
22 | 23 | ||
diff --git a/meta/recipes-core/ncurses/ncurses_6.2.bb b/meta/recipes-core/ncurses/ncurses_6.2.bb index 723e685a9b..5c02db8541 100644 --- a/meta/recipes-core/ncurses/ncurses_6.2.bb +++ b/meta/recipes-core/ncurses/ncurses_6.2.bb | |||
@@ -2,12 +2,11 @@ require ncurses.inc | |||
2 | 2 | ||
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://config.cache \ | ||
6 | " | 5 | " |
7 | # commit id corresponds to the revision in package version | 6 | # commit id corresponds to the revision in package version |
8 | SRCREV = "a669013cd5e9d6434e5301348ea51baf306c93c4" | 7 | SRCREV = "a669013cd5e9d6434e5301348ea51baf306c93c4" |
9 | S = "${WORKDIR}/git" | 8 | S = "${WORKDIR}/git" |
10 | EXTRA_OECONF += "--with-abi-version=5 --cache-file=${B}/config.cache" | 9 | EXTRA_OECONF += "--with-abi-version=5" |
11 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+(\+\d+)*)" | 10 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+(\+\d+)*)" |
12 | 11 | ||
13 | # This is needed when using patchlevel versions like 6.1+20181013 | 12 | # This is needed when using patchlevel versions like 6.1+20181013 |