* [PATCH] ncurses: remove config.cache
@ 2020-09-10 20:53 Ross Burton
2020-09-11 0:22 ` [OE-core] " Khem Raj
2020-09-11 0:38 ` Anuj Mittal
0 siblings, 2 replies; 4+ messages in thread
From: Ross Burton @ 2020-09-10 20:53 UTC (permalink / raw)
To: openembedded-core
From: Ross Burton <ross.burton@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.
Signed-off-by: Ross Burton <ross.burton@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
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [OE-core] [PATCH] ncurses: remove config.cache
2020-09-10 20:53 [PATCH] ncurses: remove config.cache Ross Burton
@ 2020-09-11 0:22 ` Khem Raj
2020-09-11 0:38 ` Anuj Mittal
1 sibling, 0 replies; 4+ messages in thread
From: Khem Raj @ 2020-09-11 0:22 UTC (permalink / raw)
To: Ross Burton; +Cc: Patches and discussions about the oe-core layer
On Thu, Sep 10, 2020 at 1:54 PM Ross Burton <ross@burtonini.com> wrote:
>
> From: Ross Burton <ross.burton@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.burton@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
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [OE-core] [PATCH] ncurses: remove config.cache
2020-09-10 20:53 [PATCH] ncurses: remove config.cache Ross Burton
2020-09-11 0:22 ` [OE-core] " Khem Raj
@ 2020-09-11 0:38 ` Anuj Mittal
2020-09-11 11:43 ` Ross Burton
1 sibling, 1 reply; 4+ messages in thread
From: Anuj Mittal @ 2020-09-11 0:38 UTC (permalink / raw)
To: ross, openembedded-core
On Thu, 2020-09-10 at 21:53 +0100, Ross Burton wrote:
> From: Ross Burton <ross.burton@intel.com>
You forgot to update your email somewhere? :)
Thanks,
Anuj
>
> 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.
>
> Signed-off-by: Ross Burton <ross.burton@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
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [OE-core] [PATCH] ncurses: remove config.cache
2020-09-11 0:38 ` Anuj Mittal
@ 2020-09-11 11:43 ` Ross Burton
0 siblings, 0 replies; 4+ messages in thread
From: Ross Burton @ 2020-09-11 11:43 UTC (permalink / raw)
To: Mittal, Anuj; +Cc: openembedded-core
On Fri, 11 Sep 2020 at 01:38, Mittal, Anuj <anuj.mittal@intel.com> wrote:
>
> On Thu, 2020-09-10 at 21:53 +0100, Ross Burton wrote:
> > From: Ross Burton <ross.burton@intel.com>
>
> You forgot to update your email somewhere? :)
It's a patch from some time ago, forgot to change the ownership. :(
Ross
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-09-11 11:44 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-10 20:53 [PATCH] ncurses: remove config.cache Ross Burton
2020-09-11 0:22 ` [OE-core] " Khem Raj
2020-09-11 0:38 ` Anuj Mittal
2020-09-11 11:43 ` Ross Burton
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.