Date: Tue, 5 Jan 2021 15:48:39 +0100 From: Baptiste Daroussin <bapt@FreeBSD.org> To: Cy Schubert <Cy.Schubert@cschubert.com> Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 821aa63a0940 - main - ncurses: only keep the version with widechar support Message-ID: <20210105144839.73qamvxrnhxpd3nk@ivaldir.net> In-Reply-To: <202101051440.105EefY4071731@slippy.cwsent.com> References: <202101051302.105D24lW041218@gitrepo.freebsd.org> <202101051440.105EefY4071731@slippy.cwsent.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--yj2rojvagivjcjon Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Jan 05, 2021 at 06:40:41AM -0800, Cy Schubert wrote: > In message <202101051302.105D24lW041218@gitrepo.freebsd.org>, Baptiste=20 > Daroussi > n writes: > > The branch main has been updated by bapt: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=3D821aa63a09402935da0a73ab= f20ba044 > > 1562aa07 > > > > commit 821aa63a09402935da0a73abf20ba0441562aa07 > > Author: Baptiste Daroussin <bapt@FreeBSD.org> > > AuthorDate: 2021-01-04 16:29:40 +0000 > > Commit: Baptiste Daroussin <bapt@FreeBSD.org> > > CommitDate: 2021-01-05 13:01:32 +0000 > > > > ncurses: only keep the version with widechar support > > =20 > > Only keep the widechar version of ncurses as libncursesw.so.9 > > =20 > > Keep the old name to avoid breaking the ABI compatibility (the non > > widechar version libncurses.so.9 is not binary compatible with > > libncursesw.so.9) since all ports and base are already only linking > > against the widechar version we can simply remove libncurses.so.9 > > =20 > > Since the .9 version only lived in the dev branch and never ended i= n a > > release, it is simply removed and not added to any binary compat > > package. > > =20 > > Add symlinks to keep build time compatibility for anyone linking ag= ainst > > -lncurses > > --- > > Makefile.inc1 | 5 +-- > > Makefile.libcompat | 4 +- > > ObsoleteFiles.inc | 2 + > > lib/ncurses/Makefile | 6 +-- > > lib/ncurses/config.mk | 11 +----- > > lib/ncurses/form/Makefile | 18 ++++++--- > > lib/ncurses/formw/Makefile | 5 --- > > lib/ncurses/formw/Makefile.depend | 17 --------- > > lib/ncurses/menu/Makefile | 18 ++++++--- > > lib/ncurses/menuw/Makefile | 5 --- > > lib/ncurses/menuw/Makefile.depend | 17 --------- > > lib/ncurses/ncurses/Makefile | 71 +++++++++++++++------------= ------ > > -- > > lib/ncurses/ncursesw/Makefile | 7 ---- > > lib/ncurses/ncursesw/Makefile.depend | 16 -------- > > lib/ncurses/panel/Makefile | 23 ++++++++---- > > lib/ncurses/panelw/Makefile | 5 --- > > lib/ncurses/panelw/Makefile.depend | 17 --------- > > share/mk/src.libnames.mk | 16 ++------ > > tools/bsdbox/Makefile.base | 2 +- > > tools/tools/ath/athratestats/Makefile | 2 +- > > 20 files changed, 87 insertions(+), 180 deletions(-) > > > > diff --git a/Makefile.inc1 b/Makefile.inc1 > > index fecdc1bdca71..a19fde9195cf 100644 > > --- a/Makefile.inc1 > > +++ b/Makefile.inc1 > > @@ -2524,7 +2524,6 @@ _bt_clean=3D ${CLEANDIR} > > ${LOCAL_TOOL_DIRS} \ > > ${_jevents} \ > > lib/ncurses/ncurses \ > > - lib/ncurses/ncursesw \ > > ${_rescue} \ > > ${_share} \ > > usr.bin/awk \ > > @@ -2870,7 +2869,7 @@ _prebuild_libs=3D ${_kerberos5_lib_libasn1} \ > > lib/libkiconv lib/libkvm lib/liblzma lib/libmd lib/libnv \ > > lib/libzstd \ > > ${_lib_casper} \ > > - lib/ncurses/ncurses lib/ncurses/ncursesw \ > > + lib/ncurses/ncurses \ > > lib/libopie lib/libpam/libpam ${_lib_libthr} \ > > ${_lib_libradius} lib/libsbuf lib/libtacplus \ > > lib/libgeom \ > > @@ -2891,7 +2890,7 @@ _prebuild_libs=3D ${_kerberos5_lib_libasn1} \ > > =20 > > .if ${MK_DIALOG} !=3D "no" > > _prebuild_libs+=3D gnu/lib/libdialog > > -gnu/lib/libdialog__L: lib/msun__L lib/ncurses/ncursesw__L > > +gnu/lib/libdialog__L: lib/msun__L lib/ncurses/ncurses__L > > .endif > > =20 > > .if ${MK_GOOGLETEST} !=3D "no" > > diff --git a/Makefile.libcompat b/Makefile.libcompat > > index 3f23a33aa19b..85859a960d81 100644 > > --- a/Makefile.libcompat > > +++ b/Makefile.libcompat > > @@ -45,7 +45,7 @@ _LC_LIBDIRS.${MK_KERBEROS:tl}+=3D kerberos5/lib > > =20 > > _LC_INCDIRS=3D \ > > include \ > > - lib/ncurses/ncursesw \ > > + lib/ncurses/ncurses \ > > ${_LC_LIBDIRS.yes} > > =20 > > .if ${MK_FILE} !=3D "no" > > @@ -94,7 +94,7 @@ build${libcompat}: .PHONY > > DIRPRFX=3D${_dir}/ ${_t} > > .endfor > > .endfor > > -.for _dir in lib/ncurses/ncurses lib/ncurses/ncursesw ${_libmagic} ${_= jevent > > s} > > +.for _dir in lib/ncurses/ncurses lib/ncurses/ncurses ${_libmagic} ${_j= events > > } > > .for _t in ${_obj} build-tools > > ${_+_}cd ${.CURDIR}/${_dir}; \ > > WORLDTMP=3D${WORLDTMP} \ > > diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc > > index e6da2abd5e5c..638b27b530f0 100644 > > --- a/ObsoleteFiles.inc > > +++ b/ObsoleteFiles.inc > > @@ -36,6 +36,8 @@ > > # xargs -n1 | sort | uniq -d; > > # done > > =20 > > +# 20210105: remove non widechar version of clang > > +OLD_LIBS+=3Dlib/libncurses.so.9 > > # 20210103: new clang import which bumps version from 11.0.0 to 11.0.1. > > OLD_FILES+=3Dusr/lib/clang/11.0.0/include/cuda_wrappers/algorithm > > OLD_FILES+=3Dusr/lib/clang/11.0.0/include/cuda_wrappers/complex > > diff --git a/lib/ncurses/Makefile b/lib/ncurses/Makefile > > index a5a19deafafd..be8697fbc609 100644 > > --- a/lib/ncurses/Makefile > > +++ b/lib/ncurses/Makefile > > @@ -1,13 +1,11 @@ > > # $FreeBSD$ > > =20 > > -SUBDIR=3D ncurses form menu panel \ > > - ncursesw formw menuw panelw > > +SUBDIR=3D ncurses form menu panel > > =20 > > SUBDIR_PARALLEL=3D > > =20 > > -.for subdir in ${SUBDIR:Nncurses*:N*w} > > +.for subdir in ${SUBDIR:Nncurses*} > > SUBDIR_DEPEND_${subdir}=3D ncurses > > -SUBDIR_DEPEND_${subdir}w=3D ncursesw > > .endfor > > =20 > > .include <bsd.subdir.mk> > > diff --git a/lib/ncurses/config.mk b/lib/ncurses/config.mk > > index d15be8601136..f199c5829b65 100644 > > --- a/lib/ncurses/config.mk > > +++ b/lib/ncurses/config.mk > > @@ -4,20 +4,11 @@ > > =20 > > NCURSES_DIR=3D ${SRCTOP}/contrib/ncurses > > =20 > > -.if defined(ENABLE_WIDEC) > > -LIB_SUFFIX=3D w > > CFLAGS+=3D -D_XOPEN_SOURCE_EXTENDED -DENABLE_WIDEC > > -NCURSES_CFG_H=3D ${.CURDIR:H}/ncurses/ncurses_cfg.h > > -.else > > -LIB_SUFFIX=3D > > NCURSES_CFG_H=3D ${.CURDIR}/ncurses_cfg.h > > -.endif > > =20 > > CFLAGS+=3D -I. > > -.if exists(${.OBJDIR:H}/ncurses${LIB_SUFFIX}) > > -CFLAGS+=3D -I${.OBJDIR:H}/ncurses${LIB_SUFFIX} > > -.endif > > -CFLAGS+=3D -I${.CURDIR:H}/ncurses${LIB_SUFFIX} > > +CFLAGS+=3D -I${.CURDIR:H}/ncurses > > =20 > > # for ${NCURSES_CFG_H} > > CFLAGS+=3D -I${.CURDIR:H}/ncurses > > diff --git a/lib/ncurses/form/Makefile b/lib/ncurses/form/Makefile > > index eab5bbb63c09..a8e636d6ce1b 100644 > > --- a/lib/ncurses/form/Makefile > > +++ b/lib/ncurses/form/Makefile > > @@ -1,10 +1,11 @@ > > # $FreeBSD$ > > =20 > > +.include <src.opts.mk> > > .include "${.CURDIR:H}/config.mk" > > =20 > > SRCDIR=3D ${NCURSES_DIR}/form > > =20 > > -LIB=3D form${LIB_SUFFIX} > > +LIB=3D formw > > =20 > > .PATH: ${SRCDIR} > > SRCS=3D \ > > @@ -54,9 +55,8 @@ CLEANFILES=3D ncurses_def.h > > CFLAGS+=3D -I${SRCDIR} > > CFLAGS+=3D -I${NCURSES_DIR}/menu > > =20 > > -LIBADD+=3D ncurses${LIB_SUFFIX} > > +LIBADD+=3D ncursesw > > =20 > > -.if defined(ENABLE_WIDEC) > > INCS=3D form.h > > =20 > > .PATH: ${NCURSES_DIR}/man > > @@ -156,8 +156,16 @@ MLINKS=3D form_cursor.3 pos_form_cursor.3 \ > > form_win.3 scale_form.3 \ > > form_win.3 set_form_sub.3 \ > > form_win.3 set_form_win.3 > > -.else > > -MAN=3D > > + > > +# backward compat > > +.if ${MK_INSTALLLIB} !=3D "no" > > +SYMLINKS+=3D libformw.a ${LIBDIR}/libform.a > > +.endif > > +.if !defined(NO_PIC) > > +SYMLINKS+=3D libformw.so ${LIBDIR}/libform.so > > +.endif > > +.if ${MK_PROFILE} !=3D "no" > > +SYMLINKS+=3D libformw_p.a ${LIBDIR}/libform_p.a > > .endif > > =20 > > .include <bsd.lib.mk> > > diff --git a/lib/ncurses/formw/Makefile b/lib/ncurses/formw/Makefile > > deleted file mode 100644 > > index 3ec7637373be..000000000000 > > --- a/lib/ncurses/formw/Makefile > > +++ /dev/null > > @@ -1,5 +0,0 @@ > > -# $FreeBSD$ > > - > > -ENABLE_WIDEC=3D > > - > > -.include "${.CURDIR:H}/form/Makefile" > > diff --git a/lib/ncurses/formw/Makefile.depend b/lib/ncurses/formw/Make= file.d > > epend > > deleted file mode 100644 > > index 3d9451023bec..000000000000 > > --- a/lib/ncurses/formw/Makefile.depend > > +++ /dev/null > > @@ -1,17 +0,0 @@ > > -# $FreeBSD$ > > -# Autogenerated - do NOT edit! > > - > > -DIRDEPS =3D \ > > - include \ > > - include/xlocale \ > > - lib/${CSU_DIR} \ > > - lib/libc \ > > - lib/libcompiler_rt \ > > - lib/ncurses/ncursesw \ > > - > > - > > -.include <dirdeps.mk> > > - > > -.if ${DEP_RELDIR} =3D=3D ${_DEP_RELDIR} > > -# local dependencies - needed for -jN in clean tree > > -.endif > > diff --git a/lib/ncurses/menu/Makefile b/lib/ncurses/menu/Makefile > > index 653619638fbc..7844cd4d936c 100644 > > --- a/lib/ncurses/menu/Makefile > > +++ b/lib/ncurses/menu/Makefile > > @@ -1,10 +1,11 @@ > > # $FreeBSD$ > > =20 > > +.include <src.opts.mk> > > .include "${.CURDIR:H}/config.mk" > > =20 > > SRCDIR=3D ${NCURSES_DIR}/menu > > =20 > > -LIB=3D menu${LIB_SUFFIX} > > +LIB=3D menuw > > =20 > > .PATH: ${SRCDIR} > > SRCS=3D \ > > @@ -40,9 +41,8 @@ CLEANFILES=3D ncurses_def.h > > =20 > > CFLAGS+=3D -I${SRCDIR} > > =20 > > -LIBADD+=3D ncurses${LIB_SUFFIX} > > +LIBADD+=3D ncursesw > > =20 > > -.if defined(ENABLE_WIDEC) > > INCS=3D menu.h eti.h > > =20 > > .PATH: ${NCURSES_DIR}/man > > @@ -128,8 +128,16 @@ MLINKS=3D menu_attributes.3 menu_back.3 \ > > mitem_value.3 item_value.3 \ > > mitem_value.3 set_item_value.3 \ > > mitem_visible.3 item_visible.3 > > -.else > > -MAN=3D > > + > > +# backward compat > > +.if ${MK_INSTALLLIB} !=3D "no" > > +SYMLINKS+=3D libmenuw.a ${LIBDIR}/libmenu.a > > +.endif > > +.if !defined(NO_PIC) > > +SYMLINKS+=3D libmenuw.so ${LIBDIR}/libmenu.so > > +.endif > > +.if ${MK_PROFILE} !=3D "no" > > +SYMLINKS+=3D libmenuw_p.a ${LIBDIR}/libmenu_p.a > > .endif > > =20 > > .include <bsd.lib.mk> > > diff --git a/lib/ncurses/menuw/Makefile b/lib/ncurses/menuw/Makefile > > deleted file mode 100644 > > index d6df56332826..000000000000 > > --- a/lib/ncurses/menuw/Makefile > > +++ /dev/null > > @@ -1,5 +0,0 @@ > > -# $FreeBSD$ > > - > > -ENABLE_WIDEC=3D > > - > > -.include "${.CURDIR:H}/menu/Makefile" > > diff --git a/lib/ncurses/menuw/Makefile.depend b/lib/ncurses/menuw/Make= file.d > > epend > > deleted file mode 100644 > > index 3d9451023bec..000000000000 > > --- a/lib/ncurses/menuw/Makefile.depend > > +++ /dev/null > > @@ -1,17 +0,0 @@ > > -# $FreeBSD$ > > -# Autogenerated - do NOT edit! > > - > > -DIRDEPS =3D \ > > - include \ > > - include/xlocale \ > > - lib/${CSU_DIR} \ > > - lib/libc \ > > - lib/libcompiler_rt \ > > - lib/ncurses/ncursesw \ > > - > > - > > -.include <dirdeps.mk> > > - > > -.if ${DEP_RELDIR} =3D=3D ${_DEP_RELDIR} > > -# local dependencies - needed for -jN in clean tree > > -.endif > > diff --git a/lib/ncurses/ncurses/Makefile b/lib/ncurses/ncurses/Makefile > > index efa38691115e..6f03d93a9ac6 100644 > > --- a/lib/ncurses/ncurses/Makefile > > +++ b/lib/ncurses/ncurses/Makefile > > @@ -3,16 +3,11 @@ > > PACKAGE=3D clibs > > SHLIBDIR?=3D /lib > > =20 > > -.if !defined(ENABLE_WIDEC) > > -# Override any MAN=3D setting below.. > > -MK_MAN=3Dno > > -.endif > > - > > .include <src.opts.mk> > > =20 > > .include "${.CURDIR:H}/config.mk" > > =20 > > -LIB=3D ncurses${LIB_SUFFIX} > > +LIB=3D ncursesw > > SHLIB_MAJOR=3D 9 > > =20 > > NO_LINT=3D > > @@ -22,17 +17,10 @@ NCURSES_MINOR!=3D egrep 'NCURSES_MINOR[ ]*=3D' ${N= CURSES_ > > DIR}/dist.mk | sed -e 's%^ > > NCURSES_PATCH!=3D egrep 'NCURSES_PATCH[ ]*=3D' ${NCURSES_DIR}/dist.mk= | s > > ed -e 's%^[^0-9]*%%' > > =20 > > # From autoconf (!) > > -.if defined(ENABLE_WIDEC) > > NCURSES_CH_T=3D cchar_t > > NCURSES_OK_WCHAR_T=3D 1 > > NEED_WCHAR_H=3D 1 > > NCURSES_EXT_COLORS=3D 1 > > -.else > > -NCURSES_CH_T=3D chtype > > -NCURSES_OK_WCHAR_T=3D > > -NEED_WCHAR_H=3D 0 > > -NCURSES_EXT_COLORS=3D 0 > > -.endif > > NCURSES_EXT_FUNCS=3D 1 > > NCURSES_CONST=3D const > > NCURSES_INLINE=3D inline > > @@ -242,7 +230,6 @@ SRCS+=3D \ > > lib_vidattr.c \ > > tty_update.c > > =20 > > -.if defined(ENABLE_WIDEC) > > .PATH: ${NCURSES_DIR}/ncurses/widechar > > SRCS+=3D \ > > charable.c \ > > @@ -265,7 +252,6 @@ SRCS+=3D \ > > lib_vline_set.c \ > > lib_wacs.c \ > > lib_wunctrl.c > > -.endif > > =20 > > .PATH: ${NCURSES_DIR}/ncurses/trace > > SRCS+=3D \ > > @@ -298,42 +284,54 @@ HEADERS=3D curses.h term.h termcap.h unctrl.h > > SRCHDRS=3D ncurses_dll.h > > CLEANFILES+=3D ncurses_dll.h > > =20 > > -.if defined(ENABLE_WIDEC) > > INCS=3D ${HEADERS} ${SRCHDRS} > > INCSLINKS=3D curses.h ${INCLUDEDIR}/ncurses.h > > -.endif > > =20 > > .if ${MK_INSTALLLIB} !=3D "no" > > -SYMLINKS+=3D libncurses${LIB_SUFFIX}.a ${LIBDIR}/libcurses${LIB_SUFFIX= }.a > > -SYMLINKS+=3D libncurses${LIB_SUFFIX}.a ${LIBDIR}/libtermcap${LIB_SUFFI= X}.a > > -SYMLINKS+=3D libncurses${LIB_SUFFIX}.a ${LIBDIR}/libtermlib${LIB_SUFFI= X}.a > > -SYMLINKS+=3D libncurses${LIB_SUFFIX}.a ${LIBDIR}/libtinfo${LIB_SUFFIX}= =2Ea > > +SYMLINKS+=3D libncursesw.a ${LIBDIR}/libcursesw.a > > +SYMLINKS+=3D libncursesw.a ${LIBDIR}/libtermcapw.a > > +SYMLINKS+=3D libncursesw.a ${LIBDIR}/libtermlibw.a > > +SYMLINKS+=3D libncursesw.a ${LIBDIR}/libtinfow.a > > +# backward compat > > +SYMLINKS+=3D libncursesw.a ${LIBDIR}/libncurses.a > > +SYMLINKS+=3D libncursesw.a ${LIBDIR}/libcurses.a > > +SYMLINKS+=3D libncursesw.a ${LIBDIR}/libtermcap.a > > +SYMLINKS+=3D libncursesw.a ${LIBDIR}/libtermlib.a > > +SYMLINKS+=3D libncursesw.a ${LIBDIR}/libtinfo.a > > .endif > > .if !defined(NO_PIC) > > # no need for major at all, it's an ld-time redirection only > > -SYMLINKS+=3D libncurses${LIB_SUFFIX}.so ${LIBDIR}/libcurses${LIB_SUFFI= X}.so > > -SYMLINKS+=3D libncurses${LIB_SUFFIX}.so ${LIBDIR}/libtermcap${LIB_SUFF= IX}.so > > -SYMLINKS+=3D libncurses${LIB_SUFFIX}.so ${LIBDIR}/libtermlib${LIB_SUFF= IX}.so > > -SYMLINKS+=3D libncurses${LIB_SUFFIX}.so ${LIBDIR}/libtinfo${LIB_SUFFIX= }.so > > +SYMLINKS+=3D libncursesw.so ${LIBDIR}/libcursesw.so > > +SYMLINKS+=3D libncursesw.so ${LIBDIR}/libtermcapw.so > > +SYMLINKS+=3D libncursesw.so ${LIBDIR}/libtermlibw.so > > +SYMLINKS+=3D libncursesw.so ${LIBDIR}/libtinfow.so > > +# backward compat > > +SYMLINKS+=3D libncursesw.so ${LIBDIR}/libncurses.so > > +SYMLINKS+=3D libncursesw.so ${LIBDIR}/libcurses.so > > +SYMLINKS+=3D libncursesw.so ${LIBDIR}/libtermcap.so > > +SYMLINKS+=3D libncursesw.so ${LIBDIR}/libtermlib.so > > +SYMLINKS+=3D libncursesw.so ${LIBDIR}/libtinfo.so > > .endif > > .if ${MK_PROFILE} !=3D "no" > > -SYMLINKS+=3D libncurses${LIB_SUFFIX}_p.a ${LIBDIR}/libcurses${LIB_SUFF= IX}_p. > > a > > -SYMLINKS+=3D libncurses${LIB_SUFFIX}_p.a ${LIBDIR}/libtermcap${LIB_SUF= FIX}_p > > .a > > -SYMLINKS+=3D libncurses${LIB_SUFFIX}_p.a ${LIBDIR}/libtermlib${LIB_SUF= FIX}_p > > .a > > -SYMLINKS+=3D libncurses${LIB_SUFFIX}_p.a ${LIBDIR}/libtinfo${LIB_SUFFI= X}_p.a > > +SYMLINKS+=3D libncursesw_p.a ${LIBDIR}/libcursesw_p.a > > +SYMLINKS+=3D libncursesw_p.a ${LIBDIR}/libtermcapw_p.a > > +SYMLINKS+=3D libncursesw_p.a ${LIBDIR}/libtermlibw_p.a > > +SYMLINKS+=3D libncursesw_p.a ${LIBDIR}/libtinfow_p.a > > +# backward compat > > +SYMLINKS+=3D libncursesw_p.a ${LIBDIR}/libncurses_p.a > > +SYMLINKS+=3D libncursesw_p.a ${LIBDIR}/libcurses_p.a > > +SYMLINKS+=3D libncursesw_p.a ${LIBDIR}/libtermcap_p.a > > +SYMLINKS+=3D libncursesw_p.a ${LIBDIR}/libtermlib_p.a > > +SYMLINKS+=3D libncursesw_p.a ${LIBDIR}/libtinfo_p.a > > .endif > > =20 > > -.if ${.CURDIR:T} =3D=3D "ncursesw" > > -.if defined(ENABLE_WIDEC) > > DOCSDIR=3D ${SHAREDIR}/doc/ncurses > > DOCS=3D ncurses-intro.html hackguide.html > > -.endif > > =20 > > .if ${MK_HTML} !=3D "no" > > .PATH: ${NCURSES_DIR}/doc/html > > FILESGROUPS=3D DOCS > > .endif > > -.endif > > =20 > > # Generated source > > .ORDER: names.c codes.c > > @@ -394,9 +392,7 @@ curses.h: curses.head MKkey_defs.sh Caps Caps-ncurs= es > > cat curses.head > $@.new > > AWK=3D${AWK} _POSIX2_VERSION=3D199209 sh ${NCURSES_DIR}/include/MKkey= _defs. > > sh \ > > ${NCURSES_DIR}/include/Caps ${NCURSES_DIR}/include/Caps-ncurses >= >=20 > > $@.new > > -.if defined(ENABLE_WIDEC) > > cat ${NCURSES_DIR}/include/curses.wide >> $@.new > > -.endif > > cat ${NCURSES_DIR}/include/curses.tail >> $@.new > > mv -f $@.new $@ > > =20 > > @@ -505,7 +501,6 @@ terminfo.5: MKterminfo.sh terminfo.head Caps > > =20 > > CLEANFILES+=3D terminfo.5 > > =20 > > -.if defined(ENABLE_WIDEC) > > .PATH: ${NCURSES_DIR}/man > > MAN=3D \ > > curs_addch.3 \ > > @@ -585,7 +580,6 @@ MAN+=3D \ > > =20 > > MAN+=3D term.5 terminfo.5 scr_dump.5 user_caps.5 > > MAN+=3D term.7 > > -.endif > > =20 > > CLEANFILES+=3D ${MAN:M*.3} > > =20 > > @@ -1065,7 +1059,6 @@ MLINKS=3D ncurses.3 curses.3 \ > > resizeterm.3 is_term_resized.3 \ > > resizeterm.3 resize_term.3 > > =20 > > -.if defined(ENABLE_WIDEC) > > MLINKS+=3Dcurs_add_wch.3 add_wch.3 \ > > curs_add_wch.3 echo_wchar.3 \ > > curs_add_wch.3 mvadd_wch.3 \ > > @@ -1145,8 +1138,6 @@ MLINKS+=3Dcurs_add_wch.3 add_wch.3 \ > > curs_scanw.3 vw_scanw.3 \ > > curs_scanw.3 vwscanw.3 \ > > curs_scanw.3 wscanw.3 > > -.endif > > - > > =20 > > .include <bsd.lib.mk> > > =20 > > diff --git a/lib/ncurses/ncursesw/Makefile b/lib/ncurses/ncursesw/Makef= ile > > deleted file mode 100644 > > index 5f6040e7119c..000000000000 > > --- a/lib/ncurses/ncursesw/Makefile > > +++ /dev/null > > @@ -1,7 +0,0 @@ > > -# $FreeBSD$ > > - > > -ENABLE_WIDEC=3D > > - > > -.PATH: ${.CURDIR:H}/ncurses > > - > > -.include "${.CURDIR:H}/ncurses/Makefile" > > diff --git a/lib/ncurses/ncursesw/Makefile.depend b/lib/ncurses/ncurses= w/Make > > file.depend > > deleted file mode 100644 > > index 8d409f5263ac..000000000000 > > --- a/lib/ncurses/ncursesw/Makefile.depend > > +++ /dev/null > > @@ -1,16 +0,0 @@ > > -# $FreeBSD$ > > -# Autogenerated - do NOT edit! > > - > > -DIRDEPS =3D \ > > - include \ > > - include/xlocale \ > > - lib/${CSU_DIR} \ > > - lib/libc \ > > - lib/libcompiler_rt \ > > - > > - > > -.include <dirdeps.mk> > > - > > -.if ${DEP_RELDIR} =3D=3D ${_DEP_RELDIR} > > -# local dependencies - needed for -jN in clean tree > > -.endif > > diff --git a/lib/ncurses/panel/Makefile b/lib/ncurses/panel/Makefile > > index 1993f5e76ac2..a22df4d89570 100644 > > --- a/lib/ncurses/panel/Makefile > > +++ b/lib/ncurses/panel/Makefile > > @@ -1,10 +1,11 @@ > > # $FreeBSD$ > > =20 > > +.include <src.opts.mk> > > .include "${.CURDIR:H}/config.mk" > > =20 > > SRCDIR=3D ${NCURSES_DIR}/panel > > =20 > > -LIB=3D panel${LIB_SUFFIX} > > +LIB=3D panelw > > =20 > > .PATH: ${SRCDIR} > > SRCS=3D \ > > @@ -29,10 +30,7 @@ CLEANFILES=3D ncurses_def.h > > =20 > > CFLAGS+=3D -I${SRCDIR} > > =20 > > -LIBADD+=3D ncurses${LIB_SUFFIX} > > - > > -.if defined(ENABLE_WIDEC) > > -INCS=3D panel.h > > +LIBADD+=3D ncursesw > > =20 > > # generate MAN > > .PATH: ${NCURSES_DIR}/man > > @@ -56,10 +54,19 @@ MLINKS=3D panel.3 bottom_panel.3 \ > > panel.3 show_panel.3 \ > > panel.3 top_panel.3 \ > > panel.3 update_panels.3 > > -.else > > -MAN=3D > > + > > +# backward compat > > +.if ${MK_INSTALLLIB} !=3D "no" > > +SYMLINKS+=3D libpanelw.a ${LIBDIR}/libpanel.a > > +.endif > > +.if !defined(NO_PIC) > > +SYMLINKS+=3D libpanelw.so ${LIBDIR}/libpanel.so > > .endif > > -=09 > > +.if ${MK_PROFILE} !=3D "no" > > +SYMLINKS+=3D libpanelw_p.a ${LIBDIR}/libpanel_p.a > > +.endif > > + > > +INCS=3D panel.h > > .include <bsd.lib.mk> > > =20 > > # Keep the .SUFFIXES line after the include of bsd.lib.mk > > diff --git a/lib/ncurses/panelw/Makefile b/lib/ncurses/panelw/Makefile > > deleted file mode 100644 > > index 2585738a5e60..000000000000 > > --- a/lib/ncurses/panelw/Makefile > > +++ /dev/null > > @@ -1,5 +0,0 @@ > > -# $FreeBSD$ > > - > > -ENABLE_WIDEC=3D > > - > > -.include "${.CURDIR:H}/panel/Makefile" > > diff --git a/lib/ncurses/panelw/Makefile.depend b/lib/ncurses/panelw/Ma= kefile > > .depend > > deleted file mode 100644 > > index 3d9451023bec..000000000000 > > --- a/lib/ncurses/panelw/Makefile.depend > > +++ /dev/null > > @@ -1,17 +0,0 @@ > > -# $FreeBSD$ > > -# Autogenerated - do NOT edit! > > - > > -DIRDEPS =3D \ > > - include \ > > - include/xlocale \ > > - lib/${CSU_DIR} \ > > - lib/libc \ > > - lib/libcompiler_rt \ > > - lib/ncurses/ncursesw \ > > - > > - > > -.include <dirdeps.mk> > > - > > -.if ${DEP_RELDIR} =3D=3D ${_DEP_RELDIR} > > -# local dependencies - needed for -jN in clean tree > > -.endif > > diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk > > index ee94279e0cca..32cd1677bcd4 100644 > > --- a/share/mk/src.libnames.mk > > +++ b/share/mk/src.libnames.mk > > @@ -144,7 +144,6 @@ _LIBRARIES=3D \ > > memstat \ > > mp \ > > mt \ > > - ncurses \ > > ncursesw \ > > netgraph \ > > netmap \ > > @@ -182,7 +181,6 @@ _LIBRARIES=3D \ > > supcplusplus \ > > sysdecode \ > > tacplus \ > > - termcap \ > > termcapw \ > > tpool \ > > ufs \ > > @@ -376,7 +374,6 @@ _DP_c+=3D ssp_nonshared > > _DP_stats=3D sbuf pthread > > _DP_stdthreads=3D pthread > > _DP_tacplus=3D md > > -_DP_panel=3D ncurses > > _DP_panelw=3D ncursesw > > _DP_rpcsec_gss=3D gssapi > > _DP_smb=3D kiconv > > @@ -663,14 +660,10 @@ LIBBSDXMLDIR=3D ${OBJTOP}/lib/libexpat > > LIBKVMDIR=3D ${OBJTOP}/lib/libkvm > > LIBPTHREADDIR=3D ${OBJTOP}/lib/libthr > > LIBMDIR=3D ${OBJTOP}/lib/msun > > -LIBFORMDIR=3D ${OBJTOP}/lib/ncurses/form > > -LIBFORMLIBWDIR=3D ${OBJTOP}/lib/ncurses/formw > > -LIBMENUDIR=3D ${OBJTOP}/lib/ncurses/menu > > -LIBMENULIBWDIR=3D ${OBJTOP}/lib/ncurses/menuw > > -LIBNCURSESDIR=3D ${OBJTOP}/lib/ncurses/ncurses > > -LIBNCURSESWDIR=3D ${OBJTOP}/lib/ncurses/ncursesw > > -LIBPANELDIR=3D ${OBJTOP}/lib/ncurses/panel > > -LIBPANELWDIR=3D ${OBJTOP}/lib/ncurses/panelw > > +LIBFORMWDIR=3D ${OBJTOP}/lib/ncurses/form > > +LIBMENUWDIR=3D ${OBJTOP}/lib/ncurses/menu > > +LIBNCURSESWDIR=3D ${OBJTOP}/lib/ncurses/ncurses > > +LIBPANELWDIR=3D ${OBJTOP}/lib/ncurses/panel > > LIBCRYPTODIR=3D ${OBJTOP}/secure/lib/libcrypto > > LIBSPLDIR=3D ${OBJTOP}/cddl/lib/libspl > > LIBSSHDIR=3D ${OBJTOP}/secure/lib/libssh > > @@ -679,7 +672,6 @@ LIBTEKENDIR=3D ${OBJTOP}/sys/teken/libteken > > LIBEGACYDIR=3D ${OBJTOP}/tools/build > > LIBLNDIR=3D ${OBJTOP}/usr.bin/lex/lib > > =20 > > -LIBTERMCAPDIR=3D ${LIBNCURSESDIR} > > LIBTERMCAPWDIR=3D ${LIBNCURSESWDIR} > > =20 > > # Default other library directories to lib/libNAME. > > diff --git a/tools/bsdbox/Makefile.base b/tools/bsdbox/Makefile.base > > index aac44480e2ca..f2ffc2e49f70 100644 > > --- a/tools/bsdbox/Makefile.base > > +++ b/tools/bsdbox/Makefile.base > > @@ -14,7 +14,7 @@ CRUNCH_ALIAS_tset=3D reset > > =20 > > CRUNCH_PROGS_usr.bin+=3D vmstat > > #CRUNCH_PROGS_user.bin+=3D systat > > -CRUNCH_LIBS+=3D -ldevstat -lncursesw -lncurses -lmemstat -lkvm=20 > > -lelf > > +CRUNCH_LIBS+=3D -ldevstat -lncursesw -lmemstat -lkvm -lelf > > =20 > > # CRUNCH_PROGS_usr.bin+=3D tar > > CRUNCH_PROGS_usr.bin+=3D cpio > > diff --git a/tools/tools/ath/athratestats/Makefile b/tools/tools/ath/at= hrates > > tats/Makefile > > index 7a51392a9a7e..ccf04ebd8da0 100644 > > --- a/tools/tools/ath/athratestats/Makefile > > +++ b/tools/tools/ath/athratestats/Makefile > > @@ -7,7 +7,7 @@ PROG=3D athratestats > > =20 > > SRCS=3D main.c opt_ah.h ah_osdep.h > > =20 > > -LIBADD+=3D ncurses > > +LIBADD+=3D ncursesw > > =20 > > CLEANFILES+=3D opt_ah.h ah_osdep.h > > =20 > > >=20 > This fails to build in compat32. >=20 > --- lib/libthr__L --- > install -U -s -o root -g wheel -m 444 -S libthr.so.3=20 > /export/obj/opt/src/git-src/amd64.amd64/obj-lib32/tmp/usr/lib32/ > --- lib/ncurses/ncurses__L --- > /opt/src/git-src/contrib/ncurses/ncurses/curses.priv.h:2322:61: error:=20 > unknown type name 'mbstate_t'; did you mean '__mbstate_t'? > extern NCURSES_EXPORT(size_t) _nc_wcrtomb (char *, wchar_t, mbstate_t *); > ^~~~~~~~~ > __mbstate_t > /export/obj/opt/src/git-src/amd64.amd64/obj-lib32/tmp/usr/include/sys/_ty= pes > .h:124:3: note: '__mbstate_t' declared here > } __mbstate_t; > ^ > /opt/src/git-src/contrib/ncurses/ncurses/widechar/charable.c:42:15: error= :=20 > implicit declaration of function 'wctob' is invalid in C99=20 > [-Werror,-Wimplicit-function-declaration] > result =3D (wctob((wint_t) ch) =3D=3D (int) ch); > ^ > /opt/src/git-src/contrib/ncurses/ncurses/widechar/charable.c:42:15: note:= =20 > did you mean 'wctomb'? > /export/obj/opt/src/git-src/amd64.amd64/obj-lib32/tmp/usr/include/stdlib.= h:1 > 23:6: note: 'wctomb' declared here > int wctomb(char *, wchar_t); > ^ > /opt/src/git-src/contrib/ncurses/ncurses/widechar/charable.c:42:22: error= :=20 > use of undeclared identifier 'wint_t' > result =3D (wctob((wint_t) ch) =3D=3D (int) ch); > ^ > /opt/src/git-src/contrib/ncurses/ncurses/widechar/charable.c:49:33: error= :=20 > unknown type name 'wint_t' > NCURSES_EXPORT(int) _nc_to_char(wint_t ch) > ^ > /opt/src/git-src/contrib/ncurses/ncurses/widechar/charable.c:53:14: error= :=20 > implicit declaration of function 'wctob' is invalid in C99=20 > [-Werror,-Wimplicit-function-declaration] > result =3D wctob(ch); > ^ > /opt/src/git-src/contrib/ncurses/ncurses/widechar/charable.c:67:16: error= :=20 > unknown type name 'wint_t' > NCURSES_EXPORT(wint_t) _nc_to_widechar(int ch) > --- cddl/lib/libspl__L --- > install -U -s -o root -g wheel -m 444 -S libspl.so.2=20 > /export/obj/opt/src/git-src/amd64.amd64/obj-lib32/tmp/usr/lib32/ > --- lib/ncurses/ncurses__L --- > ^ > /opt/src/git-src/contrib/ncurses/ncurses/widechar/charable.c:69:11: error= :=20 > expected ';' after expression > wint_t result; > ^ > ; > --- cddl/lib/libnvpair__L --- > install -U -o root -g wheel -m 444 libnvpair.so.2.debug=20 > /export/obj/opt/src/git-src/amd64.amd64/obj-lib32/tmp/usr/lib/debug/usr/l= ib3 > 2/ > --- lib/ncurses/ncurses__L --- > /opt/src/git-src/contrib/ncurses/ncurses/widechar/charable.c:69:5: error:= =20 > use of undeclared identifier 'wint_t' > wint_t result; > ^ > /opt/src/git-src/contrib/ncurses/ncurses/widechar/charable.c:69:12: error= :=20 > use of undeclared identifier 'result' > wint_t result; > ^ > /opt/src/git-src/contrib/ncurses/ncurses/widechar/charable.c:71:5: error:= =20 > use of undeclared identifier 'result' > result =3D btowc(ch); > ^ > /opt/src/git-src/contrib/ncurses/ncurses/widechar/charable.c:71:14: error= :=20 > implicit declaration of function 'btowc' is invalid in C99=20 > [-Werror,-Wimplicit-function-declaration] > result =3D btowc(ch); > ^ > /opt/src/git-src/contrib/ncurses/ncurses/widechar/charable.c:71:14: note:= =20 > did you mean 'mbtowc'? > /export/obj/opt/src/git-src/amd64.amd64/obj-lib32/tmp/usr/include/stdlib.= h:1 > 09:6: note: 'mbtowc' declared here > int mbtowc(wchar_t * __restrict, const char * __restrict, size_t); > ^ > /opt/src/git-src/contrib/ncurses/ncurses/widechar/charable.c:84:12: error= :=20 > use of undeclared identifier 'result' > return result; > ^ > 14 errors generated. > *** [charable.o] Error code 1 >=20 > make[4]: stopped in /opt/src/git-src/lib/ncurses/ncurses > 1 error >=20 > make[4]: stopped in /opt/src/git-src/lib/ncurses/ncurses > --- cddl/lib/libicp__L --- > --- cddl/lib/libicp_rescue__L --- > --- lib/libufs__L --- > install -U -C -o root -g wheel -m 444 libufs_p.a=20 > /export/obj/opt/src/git-src/amd64.amd64/obj-lib32/tmp/usr/lib32/ > --- lib/libutil__L --- > --- lib/libthr__L --- > install -U -o root -g wheel -m 444 libthr.so.3.debug=20 > /export/obj/opt/src/git-src/amd64.amd64/obj-lib32/tmp/usr/lib/debug/usr/l= ib3 > 2/ > --- cddl/lib/libspl__L --- > install -U -o root -g wheel -m 444 libspl.so.2.debug=20 > /export/obj/opt/src/git-src/amd64.amd64/obj-lib32/tmp/usr/lib/debug/usr/l= ib3 > 2/ > --- lib/libthr__L --- > --- cddl/lib/libnvpair__L --- > install -U -l rs -o root -g wheel -m 755 -S libnvpair.so.2=20 > /export/obj/opt/src/git-src/amd64.amd64/obj-lib32/tmp/usr/lib32/libnvpair= =2Eso > *** [build32] Error code 2 >=20 > make[1]: stopped in /opt/src/git-src > 1 error >=20 > make[1]: stopped in /opt/src/git-src > exiting RC=3D2: building amd64 > slippy#=20 >=20 >=20 Weird are you building with -DNO_CLEAN ? or clean build ? Best regards, Bapt --yj2rojvagivjcjon Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEgOTj3suS2urGXVU3Y4mL3PG3PloFAl/0fEUACgkQY4mL3PG3 PlqWcBAAtDR2WDa5g94gWIeJMV2O9isv6qVb8uXY/fwO3yxsWpOK+JjHiHseERlk Yia64tUyvh8SGnnip8GZk4jn/z4RQNW61MG62DdtEJBeBxD6zNfMEmpeVQS9XTGq lvAz+YgEx3nGGkWO8bqJlaJWLCy3n0ObsdRqOJcM6+iY66OC4evOmiNNzc4D8edQ 0Z2rZduOgZ2/HpTI2o/gwbCXkEMdhq/xJ/FVbXdJU2XvA+pApvQNmPKnjOCjBuZT XHD6RpioJbyiQtTbWf+O6fJJB9D4ggY2PWzXxOzjqdb77YXel52pdb1f9CFx4Mly 3tEMfrgj8a2dO6pW3FMGALrZAHZsbPa2WJthmFS+yOx8cfRKAAidnAQRBkfQDYML sMNGP5dL+hPfGyGLIqwT84fU70EmdoenaTceiqa/Pm8e+MVmIbZ7gbyn0k+1A3KQ NVergtgbSl8g0vMfI12lSVvobtJeR1AiCGj0elWID5poAYX7fKKOc1mI6lgyJVmS bjWG81MA2YWVWgoQhj+vGbZx5oJBiUHQ3+2/K5LTwf3Y6qCMrVJt52qe1ExP6pv7 ACRBDmu5bsS8e3MYfRpyVnkVQwQzv5UNBjxLVXg99emxyPXPFXY+ch7fRuIVMrXZ nMywpxUOb12vAxXj3wQwdAu7QHA6qp+fIK6TsKkbDZgdQAprAdI= =j5x6 -----END PGP SIGNATURE----- --yj2rojvagivjcjon--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20210105144839.73qamvxrnhxpd3nk>