svn commit: r339637 - head/lib/ncurses/ncurses

Alex Richardson arichardson at FreeBSD.org
Tue Oct 23 06:31:32 UTC 2018


Author: arichardson
Date: Tue Oct 23 06:31:31 2018
New Revision: 339637
URL: https://svnweb.freebsd.org/changeset/base/339637

Log:
  Fix ncurses fallback.c build with a strict build shell
  
  The script uses shift three times and when building with a strict /bin/sh
  shifting without any arguments will cause the script to fail. In this case
  the target will fail and we write an empty output file. When doing a
  NO_CLEAN build after this will mean fallback.c is up to date and clang
  will happily compile the empty input file which leads to strange build
  errors later.
  
  Fixed by passing three empty arguments to MkFallback.sh and only creating
  fallback.c if MKfallback.sh succeeds.
  
  Aproved By:	brooks (mentor)
  Differential Revision: https://reviews.freebsd.org/D16867

Modified:
  head/lib/ncurses/ncurses/Makefile

Modified: head/lib/ncurses/ncurses/Makefile
==============================================================================
--- head/lib/ncurses/ncurses/Makefile	Tue Oct 23 06:31:25 2018	(r339636)
+++ head/lib/ncurses/ncurses/Makefile	Tue Oct 23 06:31:31 2018	(r339637)
@@ -350,7 +350,8 @@ expanded.c: MKexpanded.sh
 	sh ${NCURSES_DIR}/ncurses/tty/MKexpanded.sh "${CC:N${CCACHE_BIN}} -E" ${CFLAGS} >expanded.c
 
 fallback.c: MKfallback.sh
-	sh ${NCURSES_DIR}/ncurses/tinfo/MKfallback.sh > fallback.c
+	sh -e ${NCURSES_DIR}/ncurses/tinfo/MKfallback.sh "" "" "" > ${.TARGET}.tmp && \
+	    mv -f ${.TARGET}.tmp ${.TARGET}
 
 # Generated headers
 nomacros.h: MKlib_gen.sh curses.h


More information about the svn-src-head mailing list