git: 821aa63a0940 - main - ncurses: only keep the version with widechar support
Cy Schubert
Cy.Schubert at cschubert.com
Tue Jan 5 15:35:18 UTC 2021
In message <20210105144839.73qamvxrnhxpd3nk at 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 at 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 at FreeBSD.org>
> > > AuthorDate: 2021-01-04 16:29:40 +0000
> > > Commit: Baptiste Daroussin <bapt at 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?
--
Cheers,
Cy Schubert <Cy.Schubert at cschubert.com>
FreeBSD UNIX: <cy at FreeBSD.org> Web: https://FreeBSD.org
NTP: <cy at nwtime.org> Web: https://nwtime.org
The need of the many outweighs the greed of the few.
More information about the dev-commits-src-main
mailing list