On Thu, Sep 10, 2020 at 1:54 PM Ross Burton <r...@burtonini.com> wrote:
>
> From: Ross Burton <ross.bur...@intel.com>
>
> 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.
>
this is a good improvement. Perhaps one downside with cache files is
that they are hardly refreshed as you have seen
> Signed-off-by: Ross Burton <ross.bur...@arm.com>
> ---
> meta/recipes-core/ncurses/files/config.cache | 4 ----
> meta/recipes-core/ncurses/ncurses.inc | 3 ++-
> meta/recipes-core/ncurses/ncurses_6.2.bb | 3 +--
> 3 files changed, 3 insertions(+), 7 deletions(-)
> delete mode 100644 meta/recipes-core/ncurses/files/config.cache
>
> 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 @@
> -#! /bin/sh
> -
> -cf_cv_func_nanosleep=yes
> -cf_cv_func_mkstemp=yes
> diff --git a/meta/recipes-core/ncurses/ncurses.inc
> b/meta/recipes-core/ncurses/ncurses.inc
> index 4156bf4f7d..1627fb91d3 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
> SRC_URI = "git://salsa.debian.org/debian/ncurses.git;protocol=https"
>
> EXTRA_AUTORECONF = "-I m4"
> -CONFIG_SITE =+ "${WORKDIR}/config.cache"
> +
> +CACHED_CONFIGUREVARS = "cf_cv_func_nanosleep=yes"
>
> EXTRASITECONFIG = "CFLAGS='${CFLAGS} -I${SYSROOT_DESTDIR}${includedir}'"
>
> 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
>
> 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"
> +EXTRA_OECONF += "--with-abi-version=5"
> UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+(\+\d+)*)"
>
> # This is needed when using patchlevel versions like 6.1+20181013
> --
> 2.28.0
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#142424):
https://lists.openembedded.org/g/openembedded-core/message/142424
Mute This Topic: https://lists.openembedded.org/mt/76765782/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
