Date: Mon, 4 Oct 2021 10:32:40 GMT From: Baptiste Daroussin <bapt@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 27803b54db20 - main - ncurses: fix path where to find curses.h at bootstrap Message-ID: <202110041032.194AWe3o054079@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=27803b54db209aad2037d5e300c4494b2bfb5193 commit 27803b54db209aad2037d5e300c4494b2bfb5193 Author: Baptiste Daroussin <bapt@FreeBSD.org> AuthorDate: 2021-10-04 10:31:23 +0000 Commit: Baptiste Daroussin <bapt@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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202110041032.194AWe3o054079>