Date: Thu, 14 Jun 2007 02:53:24 +0000 (UTC) From: Rong-En Fan <rafan@FreeBSD.org> To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/lib/ncurses/form Makefile src/lib/ncurses/menu Makefile src/lib/ncurses/ncurses Makefile src/lib/ncurses/panel Makefile Message-ID: <200706140253.l5E2rO5o092887@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
rafan 2007-06-14 02:53:24 UTC
FreeBSD src repository
Modified files: (Branch: RELENG_6)
lib/ncurses/form Makefile
lib/ncurses/menu Makefile
lib/ncurses/ncurses Makefile
lib/ncurses/panel Makefile
Log:
MFC the following changes:
src/lib/ncurses/form/Makefile 1.14
src/lib/ncurses/menu/Makefile 1.16
src/lib/ncurses/ncurses/Makefile 1.90
src/lib/ncurses/panel/Makefile 1.15
- When I introduce wide character enabled ncurses into base, all headers
are installed twice (once in non-widec version, onec in widec version).
Headers with widec enabled are compatible with non-widec version
for libraries. However, if you do a repeat build/install, the curses.h
is always overwritten. The reason is that headers and statics libraries
are installed with -C option to preserve their mtime if no actual changes,
which saves time when doing incremental builds. The curses.h is installed
by non-widec ncurses first, then by widec ncurses. So next time, it happens
again. You see something like this:
# pwd
/usr/src/lib/ncurses
# make -s installincludes INSTALL="install -v"
===> ncurses (installincludes)
install: curses.h -> /usr/include/curses.h
===> ncursesw (installincludes)
install: curses.h -> /usr/include/curses.h
# make -s installincludes INSTALL="install -v"
===> ncurses (installincludes)
install: curses.h -> /usr/include/curses.h
===> ncursesw (installincludes)
install: curses.h -> /usr/include/curses.h
The solution is to disable installing headers in non-widec version. Now
you see this:
# pwd
/usr/src/lib/ncurses
# make -s installincludes INSTALL="install -v"
===> ncurses (installincludes)
===> ncursesw (installincludes)
# make -s installincludes INSTALL="install -v"
===> ncurses (installincludes)
===> ncursesw (installincludes)
For form/panel/menu libraries, the headers are the same for both version.
To be consistent with ncurses, I also disable the installation in non-widec
version.
Reported by: des
Reviewed by: ru
Thanks to: ru
Approved by: delphij (mentor)
Revision Changes Path
1.13.2.2 +2 -0 src/lib/ncurses/form/Makefile
1.15.2.2 +2 -0 src/lib/ncurses/menu/Makefile
1.87.2.3 +3 -0 src/lib/ncurses/ncurses/Makefile
1.14.2.2 +2 -0 src/lib/ncurses/panel/Makefile
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200706140253.l5E2rO5o092887>