Date: Thu, 7 Jan 2021 14:58:42 +0100 From: Baptiste Daroussin <bapt@FreeBSD.org> To: Kyle Evans <kevans@freebsd.org> Cc: src-committers <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: <20210107135842.lji6ydbajmzxqiuq@ivaldir.net> In-Reply-To: <CACNAnaGpaKpjXGvx=CFBSM68by8NWgAjKoNwsDTBoi_CeBg7Wg@mail.gmail.com> References: <202101051302.105D24lW041218@gitrepo.freebsd.org> <CACNAnaGpaKpjXGvx=CFBSM68by8NWgAjKoNwsDTBoi_CeBg7Wg@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--cqvldhvjompcmxf2 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Jan 07, 2021 at 07:53:47AM -0600, Kyle Evans wrote: > On Tue, Jan 5, 2021 at 7:02 AM Baptiste Daroussin <bapt@freebsd.org> wrot= e: > > > > The branch main has been updated by bapt: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=3D821aa63a09402935da0a73ab= f20ba0441562aa07 > > > > 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 > > > > Only keep the widechar version of ncurses as libncursesw.so.9 > > > > 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 > > > > 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. > > > > 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/libn= v \ > > 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} \ > > > > .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 > > > > .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 > > > > _LC_INCDIRS=3D \ > > include \ > > - lib/ncurses/ncursesw \ > > + lib/ncurses/ncurses \ > > ${_LC_LIBDIRS.yes} > > > > .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} ${_= jevents} > > +.for _dir in lib/ncurses/ncurses lib/ncurses/ncurses ${_libmagic} ${_j= events} > > .for _t in ${_obj} build-tools > > ${_+_}cd ${.CURDIR}/${_dir}; \ > > WORLDTMP=3D${WORLDTMP} \ >=20 > The second occurence of lib/ncurses/ncurses should probably just go away? >=20 > > 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 @@ > > > > NCURSES_DIR=3D ${SRCTOP}/contrib/ncurses > > > > -.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 > > > > 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 > > > > # for ${NCURSES_CFG_H} > > CFLAGS+=3D -I${.CURDIR:H}/ncurses >=20 > Based on this we should really just nuke the entire ncurses dir for > older WITHOUT_CLEAN builds, because any objects in this objdir will > have been built without -DENABLE_WIDEC. Maybe just key it off of an > ncursesw directory existing in the objdir hierarchy and nuke it all in > depend-cleanup. >=20 Yes to everything you said ;) Best regards, Bapt --cqvldhvjompcmxf2 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEgOTj3suS2urGXVU3Y4mL3PG3PloFAl/3E48ACgkQY4mL3PG3 PlouBRAA2STgN5MtK60g6hoVhMXJO41yJarEwowR3cc8pgCv/1hFMoh2L6h2fDn/ oq+lGSaC2VEmHq6xOfny22TFDA1+nhZmfPu1BTxqmoBCp8+cPhQaQRtbCrsg8lRF /AEStb0TDez84YMMSMbDb9VQfnOxc6hwKs6ra31R79QJJAAgVC/RSGFtf6sDv5ax u2IVuXrLNR9fomDhVajhjN4EQMS45U53hF6wQ6d1lFosOcBIHOzGkU5mdjHcagOs SF/H60g7P+VdG9zZC4krbg/WU9aFwt3czLl+9S3uEnHX/IobAzTfSN0pY5qrHyvP fdMNTOFeukX9vuQq+OwiWBhpRWlq3xDSX7jPkhbQxiUxJRW64oZhGD6ro3IrNltU f45Bf17/HmQAp3nW8YuVyRyfnWKUb8y1I4u9S1r9ZJ1bi524MI7YbAx7SGt/5Wqp hZ58WNS/6VGSpQwnhpP8dhrrJHcM+mcglN/baNx4YbZQlReCM1LtMoK4YFAB57zy mtVK96HCpnINsL/0MMVqVPwDqx+JL0DyAtvyMReSarKAo9x+tlNSj3yR6i1mJIiw BokgNL/9Z3cNSt9uTp+rSWKgqnucNYpEPlX458e9u1e+CU6bN8/o/q190FfhPhcz 3l1BOatUTcxO0fJoQwudq3ZQPeXyzKrswqE98K8jYljImg5jpeQ= =wACi -----END PGP SIGNATURE----- --cqvldhvjompcmxf2--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20210107135842.lji6ydbajmzxqiuq>