D41834.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D41834.diff
View Options

	diff --git a/lib/ncurses/config.mk b/lib/ncurses/config.mk
	--- a/lib/ncurses/config.mk
	+++ b/lib/ncurses/config.mk
	@@ -6,6 +6,8 @@
	NCURSES_MINOR= 2
	NCURSES_PATCH= 20210220

	+TINFO_OBJDIR?= ${.OBJDIR:H}/tinfo
	+
	CFLAGS+= -D_XOPEN_SOURCE_EXTENDED
	NCURSES_CFG_H= ${.CURDIR}/ncurses_cfg.h

	@@ -17,7 +19,7 @@

	CFLAGS+= -I${NCURSES_DIR}/include
	CFLAGS+= -I${NCURSES_DIR}/ncurses
	-CFLAGS+= -I${.OBJDIR:H}/tinfo/
	+CFLAGS+= -I${TINFO_OBJDIR}

	CFLAGS+= -Wall

	@@ -27,7 +29,7 @@

	# everyone needs this
	.PATH: ${NCURSES_DIR}/include
	-.PATH: ${.OBJDIR:H}/tinfo/
	+.PATH: ${TINFO_OBJDIR}

	# tools and directories
	AWK?= awk
	diff --git a/lib/ncurses/ncurses/Makefile b/lib/ncurses/ncurses/Makefile
	--- a/lib/ncurses/ncurses/Makefile
	+++ b/lib/ncurses/ncurses/Makefile
	@@ -180,9 +180,9 @@
	-e 's,@@STATICLIB_SUFFIX@@,${_STATICLIB_SUFFIX},g' \
	${.ALLSRC} > ${.TARGET}

	-lib_gen.c: MKlib_gen.sh ${.OBJDIR:H}/tinfo/curses.h ncurses_dll.h
	+lib_gen.c: MKlib_gen.sh ${TINFO_OBJDIR}/curses.h ncurses_dll.h
	LC_ALL=C sh ${NCURSES_DIR}/ncurses/base/MKlib_gen.sh "${CPP:N${CCACHE_BIN}} ${CFLAGS}" \
	- "${AWK}" generated < ${.OBJDIR:H}/tinfo/curses.h >$@
	+ "${AWK}" generated < ${TINFO_OBJDIR}/curses.h >$@

	expanded.c: MKexpanded.sh
	sh ${NCURSES_DIR}/ncurses/tty/MKexpanded.sh "${CC:N${CCACHE_BIN}} -E" ${CFLAGS} >expanded.c