Skip to contentSkip to conversation

ncurses: remove config.cache

PATCH In review Ross Burton 3 participants 4 messages Sep 10, 2020 – Sep 11, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ncurses: remove config.cache

From: Ross Burton <[email protected]>

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.

---
 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
meta/recipes-core/ncurses/files/config.cache deleted +0 -4
deleted file mode 100644
index 6a9217d5bb..0000000000
@@ -1,4 +0,0 @@
-#! /bin/sh
-
-cf_cv_func_nanosleep=yes
-cf_cv_func_mkstemp=yes
meta/recipes-core/ncurses/ncurses.inc +2 -1
index 4156bf4f7d..1627fb91d3 100644
@@ -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}'"
 
meta/recipes-core/ncurses/ncurses_6.2.bb +1 -2
index 723e685a9b..5c02db8541 100644
@@ -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
Signature · 1 line
2.28.0
#1 lore raw
Quoted 8 lines · Ross Burton

From: Ross Burton <[email protected]>

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

Quoted 54 lines
---
 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
meta/recipes-core/ncurses/files/config.cache deleted +0 -4
deleted file mode 100644
index 6a9217d5bb..0000000000
@@ -1,4 +0,0 @@
-#! /bin/sh
-
-cf_cv_func_nanosleep=yes
-cf_cv_func_mkstemp=yes
meta/recipes-core/ncurses/ncurses.inc +2 -1
index 4156bf4f7d..1627fb91d3 100644
@@ -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}'"
 
meta/recipes-core/ncurses/ncurses_6.2.bb +1 -3
index 723e685a9b..5c02db8541 100644
@@ -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

#2 lore raw
In reply to Ross Burton
Quoted 1 line · Ross Burton

From: Ross Burton <[email protected]>

You forgot to update your email somewhere? :)

Thanks,

Anuj

Quoted 64 lines

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.

---
 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
meta/recipes-core/ncurses/files/config.cache deleted +0 -4
deleted file mode 100644
index 6a9217d5bb..0000000000
@@ -1,4 +0,0 @@
-#! /bin/sh
-
-cf_cv_func_nanosleep=yes
-cf_cv_func_mkstemp=yes
meta/recipes- renamed from meta/recipes-core/ncurses/ncurses.inc +0 -0

core/ncurses/ncurses.inc
index 4156bf4f7d..1627fb91d3 100644

meta/recipes-core/ncurses/ncurses.inc +0 -0
@@ -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"

meta/recipes-core/ncurses/ncurses.inc +2 -2
-CONFIG_SITE =+ "${WORKDIR}/config.cache"
+
+CACHED_CONFIGUREVARS = "cf_cv_func_nanosleep=yes"
 
 EXTRASITECONFIG = "CFLAGS='${CFLAGS}
-I${SYSROOT_DESTDIR}${includedir}'"
meta/recipes- renamed from meta/recipes-core/ncurses/ncurses_6.2.bb +0 -0

core/ncurses/ncurses_6.2.bb
index 723e685a9b..5c02db8541 100644

meta/recipes-core/ncurses/ncurses_6.2.bb +0 -2
@@ -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

#3 lore raw
Quoted 5 lines · Anuj
Quoted 1 line · Ross Burton

From: Ross Burton <[email protected]>

You forgot to update your email somewhere? :)

It's a patch from some time ago, forgot to change the ownership. :(

Ross