Date: Tue, 05 Jan 2021 09:32:01 -0800 From: Cy Schubert <Cy.Schubert@cschubert.com> To: Baptiste Daroussin <bapt@FreeBSD.org> 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: <202101051732.105HW1r9003463@slippy.cwsent.com> In-Reply-To: <202101051535.105FZDAX036599@slippy.cwsent.com> References: <202101051302.105D24lW041218@gitrepo.freebsd.org> <202101051440.105EefY4071731@slippy.cwsent.com> <20210105144839.73qamvxrnhxpd3nk@ivaldir.net> <202101051535.105FZDAX036599@slippy.cwsent.com>
next in thread | previous in thread | raw e-mail | index | archive | help
In message <202101051535.105FZDAX036599@slippy.cwsent.com>, Cy Schubert writes: > In message <20210105144839.73qamvxrnhxpd3nk@ivaldir.net>, Baptiste > Daroussin wr > ites: > > > > --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 > [...] > > >=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 ? > > NO_CLEAN build. Do you think we need circumvention shim or an UPDATING > entry? I'm seeing the following poudriere failure post installing this into a poudriere jail. cd xxd; CC="cc" CFLAGS="-DLIBICONV_PLUG -I/usr/local/include -O2 -pipe -Wno-misleading-indentation -Wno-tautological-overlap-compare -DLIBICONV_PLUG -fstack-protector-strong -fno-strict-aliasing -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1" LDFLAGS="-L. -fstack-protector-strong -rdynamic -Wl,-R/usr/local/lib/perl5/5.32/mach/COR E -fstack-protector-strong -L/usr/local/lib -Wl,--as-needed" /usr/bin/make -f Makefile cc -DLIBICONV_PLUG -I/usr/local/include -O2 -pipe -Wno-misleading-indentatio n -Wno-tautological-overlap-compare -DLIBICONV_PLUG -fstack-protector-strong -fno-strict-aliasing -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 -Wno-misleading-indentation -Wno-tautological-overlap-co mpare -L. -fstack-protector-strong -rdynamic -Wl,-R/usr/local/lib/perl5/5 .32/mach/CORE -fstack-protector-strong -L/usr/local/lib -Wl,--as-needed -DUNIX -o xxd xxd.c OLD_PO_FILE_INPUT=yes msgfmt -v -o af.mo af.po ld-elf.so.1: Shared object "libncurses.so.9" not found, required by "libtextstyle.so.0" *** Error code 1 Stop. make[3]: stopped in /wrkdirs/usr/ports/editors/vim/work/vim-8.2.2263/src/po *** Error code 1 Stop. make[2]: stopped in /wrkdirs/usr/ports/editors/vim/work/vim-8.2.2263/src *** Error code 1 Stop. make[1]: stopped in /wrkdirs/usr/ports/editors/vim/work/vim-8.2.2263 *** Error code 1 Stop. make: stopped in /usr/ports/editors/vim =>> Cleaning up wrkdir ===> Cleaning for vim-8.2.2263 build of editors/vim | vim-8.2.2263 ended at Tue Jan 5 09:10:33 PST 2021 build time: 00:05:46 !!! build failure encountered !!! devel/libtextstyle looks like it needs a rebuild. We probably need __FreeBSD_version bump to force a poudriere rebuild too. -- Cheers, Cy Schubert <Cy.Schubert@cschubert.com> FreeBSD UNIX: <cy@FreeBSD.org> Web: https://FreeBSD.org NTP: <cy@nwtime.org> Web: https://nwtime.org The need of the many outweighs the greed of the few.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202101051732.105HW1r9003463>