git: 1e4603b7a819 - stable/14 - ncurses: Fix codegen for key names and codes
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 30 Oct 2024 00:53:44 UTC
The branch stable/14 has been updated by lwhsu:
URL: https://cgit.FreeBSD.org/src/commit/?id=1e4603b7a8193064a9879c6c1906be1c7cb57575
commit 1e4603b7a8193064a9879c6c1906be1c7cb57575
Author: SHENG-YI HONG <aokblast@FreeBSD.org>
AuthorDate: 2024-10-23 20:38:33 +0000
Commit: Li-Wen Hsu <lwhsu@FreeBSD.org>
CommitDate: 2024-10-30 00:53:05 +0000
ncurses: Fix codegen for key names and codes
Adding back arguments, which were missed during the import of ncurses version
6.5, to the code gen awk script.
This is modified from lib_keyname.c and keys.list targets in
contrib/ncurses/ncurses/Makefile.in of
21817992b3314c908ab50f0bb88d2ee750b9c4ac
PR: 280697
Reported by: np
Reviewed by: bapt
Tested by: scf
Fixes: 21817992b331 ncurses: vendor import version 6.5
MFC after: 1 week
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D47153
(cherry picked from commit 514f4e89acd2e7b1824b261055bef49a3da6a956)
---
lib/ncurses/tinfo/Makefile | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/ncurses/tinfo/Makefile b/lib/ncurses/tinfo/Makefile
index b202a40a1cc3..072c2368d4b4 100644
--- a/lib/ncurses/tinfo/Makefile
+++ b/lib/ncurses/tinfo/Makefile
@@ -223,7 +223,8 @@ codes.c: MKcodes.awk
${AWK} -f ${NCURSES_DIR}/ncurses/tinfo/MKcodes.awk bigstrings=${USE_BIG_STRINGS} ${NCURSES_DIR}/include/Caps > codes.c
lib_keyname.c: keys.list MKkeyname.awk
- ${AWK} -f ${NCURSES_DIR}/ncurses/base/MKkeyname.awk bigstrings=${USE_BIG_STRINGS} keys.list > lib_keyname.c
+ ${AWK} -f ${NCURSES_DIR}/ncurses/base/MKkeyname.awk use_sigwinch=${ENABLE_SIGWINCH} \
+ bigstrings=${USE_BIG_STRINGS} keys.list > lib_keyname.c
unctrl.c: MKunctrl.awk
echo | ${AWK} -f ${NCURSES_DIR}/ncurses/base/MKunctrl.awk bigstrings=${USE_BIG_STRINGS} > unctrl.c
@@ -271,7 +272,7 @@ curses.h: curses.head MKkey_defs.sh Caps Caps-ncurses
# Generated intermediate files
keys.list: MKkeys_list.sh Caps Caps-ncurses
- AWK=${AWK} sh ${NCURSES_DIR}/ncurses/tinfo/MKkeys_list.sh \
+ AWK=${AWK} USE_SIGWINCH=${ENABLE_SIGWINCH} sh ${NCURSES_DIR}/ncurses/tinfo/MKkeys_list.sh \
${NCURSES_DIR}/include/Caps ${NCURSES_DIR}/include/Caps-ncurses | LC_ALL=C sort > keys.list
.if ${MK_DIRDEPS_BUILD} == "yes" && ${MACHINE} != "host"