git: 27803b54db20 - main - ncurses: fix path where to find curses.h at bootstrap

Baptiste Daroussin bapt at FreeBSD.org
Mon Oct 4 10:32:41 UTC 2021


The branch main has been updated by bapt:

URL: https://cgit.FreeBSD.org/src/commit/?id=27803b54db209aad2037d5e300c4494b2bfb5193

commit 27803b54db209aad2037d5e300c4494b2bfb5193
Author:     Baptiste Daroussin <bapt at FreeBSD.org>
AuthorDate: 2021-10-04 10:31:23 +0000
Commit:     Baptiste Daroussin <bapt at FreeBSD.org>
CommitDate: 2021-10-04 10:31:23 +0000

    ncurses: fix path where to find curses.h at bootstrap
    
    after the split, curses.h is now generated by tinfo Makefile, but
    still used for a file generated in ncurses lib. Adjust the path to
    make sure curses.h is always found
---
 lib/ncurses/ncurses/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/ncurses/ncurses/Makefile b/lib/ncurses/ncurses/Makefile
index 35b123a22292..d2ba1007b54a 100644
--- a/lib/ncurses/ncurses/Makefile
+++ b/lib/ncurses/ncurses/Makefile
@@ -173,9 +173,9 @@ SHLIB_LDSCRIPT=	libncursesw.ldscript
 libncurses.ldscript:
 	@${ECHO} "INPUT(${SHLIB_NAME} AS NEEDED(-ltinfow))" >$@
 
-lib_gen.c: MKlib_gen.sh curses.h ncurses_dll.h
+lib_gen.c: MKlib_gen.sh ${.OBJDIR:H}/tinfo/curses.h ncurses_dll.h
 	LC_ALL=C sh ${NCURSES_DIR}/ncurses/base/MKlib_gen.sh "${CPP:N${CCACHE_BIN}} ${CFLAGS}" \
-	    "${AWK}" generated < curses.h >$@
+	       "${AWK}" generated < ${.OBJDIR:H}/tinfo/curses.h >$@
 
 expanded.c: MKexpanded.sh
 	sh ${NCURSES_DIR}/ncurses/tty/MKexpanded.sh "${CC:N${CCACHE_BIN}} -E" ${CFLAGS} >expanded.c


More information about the dev-commits-src-all mailing list