Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 7 Jan 2021 09:43:25 +0100
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        Gordon Bergling <gbe@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:  <20210107084325.mbwynkmgadspbtlf@ivaldir.net>
In-Reply-To: <X/a4Lbv2%2BQRK6t7B@lion.0xfce3.net>
References:  <202101051302.105D24lW041218@gitrepo.freebsd.org> <X/XXXBR%2BvalfO2Fu@lion.0xfce3.net> <X/a4Lbv2%2BQRK6t7B@lion.0xfce3.net>

next in thread | previous in thread | raw e-mail | index | archive | help

--44yvuvcsowe3zlep
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Thu, Jan 07, 2021 at 08:28:45AM +0100, Gordon Bergling wrote:
> On Wed, Jan 06, 2021 at 04:29:32PM +0100, Gordon Bergling wrote:
> > On Tue, Jan 05, 2021 at 01:02:04PM +0000, Baptiste Daroussin wrote:
> > > The branch main has been updated by bapt:
> > >=20
> > > URL: https://cgit.FreeBSD.org/src/commit/?id=3D821aa63a09402935da0a73=
abf20ba0441562aa07
> > >=20
> > > 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
> > >=20
> > >     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 linki=
ng
> > >     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=
 in 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 =
against
> > >     -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(-)
> > [...]
> >=20
> > This also breaks the build on arm64. I had NO_CLEAN=3Dyes applied, but =
this error
> > is generated after a 'make clean cleandepend'. The src.conf is the foll=
owing,
> >=20
> > WITH_MALLOC_PRODUCTION=3D1
> > WITH_EXTRA_TCP_STACKS=3D1
> > WITH_BEARSSL=3D1
> > WITH_PIE=3D1
> > WITH_RETPOLINE=3D1
> >=20
> > Is there anything else I can do?
> >=20
> > -----------------------------------------------------------------------=
--------
> > =3D=3D=3D> cddl/lib/libnvpair (obj,all,install)
> > In file included from /tank/nfs_public/tiny/src/contrib/ncurses/ncurses=
/widechar/lib_add_wch.c:37:
> > /tank/nfs_public/tiny/src/contrib/ncurses/ncurses/curses.priv.h:2062:40=
: error: a parameter list without types is only allowed
> > in a function definition
> > extern NCURSES_EXPORT(int) _nc_to_char(wint_t);
> >                                        ^
> > /tank/nfs_public/tiny/src/contrib/ncurses/ncurses/curses.priv.h:2063:23=
: error: unknown type name 'wint_t'
> > extern NCURSES_EXPORT(wint_t) _nc_to_widechar(int);
> >                       ^
> > /tank/nfs_public/tiny/src/contrib/ncurses/ncurses/curses.priv.h:2322:61=
: error: unknown type name 'mbstate_t'; did you mean '__
> > mbstate_t'?
> > extern NCURSES_EXPORT(size_t) _nc_wcrtomb (char *, wchar_t, mbstate_t *=
);
> >                                                             ^~~~~~~~~
> >                                                             __mbstate_t
> > /tank/nfs_public/tiny/obj/tank/nfs_public/tiny/src/arm64.aarch64/tmp/us=
r/include/sys/_types.h:124:3: note: '__mbstate_t' declar
> > ed here
> > } __mbstate_t;
> >   ^
> > /tank/nfs_public/tiny/src/contrib/ncurses/ncurses/widechar/lib_add_wch.=
c:46:34: error: excess elements in struct initializer [-
> > Werror,-Wexcess-initializers]
> > static const cchar_t blankchar =3D NewChar(BLANK_TEXT);
> >                                  ^~~~~~~~~~~~~~~~~~~
> > /tank/nfs_public/tiny/src/contrib/ncurses/ncurses/curses.priv.h:1537:21=
: note: expanded from macro 'NewChar'
> > #define NewChar(ch)     NewChar2(ChCharOf(ch), ChAttrOf(ch))
> >                         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> > /tank/nfs_public/tiny/src/contrib/ncurses/ncurses/curses.priv.h:1536:43=
: note: expanded from macro 'NewChar2'
> > #define NewChar2(c,a)   { a, { c, NulChar } NulColor }
> >                                             ^~~~~~~~
> > /tank/nfs_public/tiny/src/contrib/ncurses/ncurses/curses.priv.h:1523:20=
: note: expanded from macro 'NulColor'
> > #define NulColor        , 0
> >                           ^
> > /tank/nfs_public/tiny/src/contrib/ncurses/ncurses/widechar/lib_add_wch.=
c:66:16: error: no member named 'ext_color' in 'cchar_t'
> >     int pair =3D GetPair(ch);
> >                ^~~~~~~~~~~
> > /tank/nfs_public/tiny/src/contrib/ncurses/ncurses/curses.priv.h:479:42:=
 note: expanded from macro 'GetPair'
> > #define GetPair(value)          GetPair2((value).ext_color, AttrOf(valu=
e))
> >                                 ~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~=
~~~
> > -----------------------------------------------------------------------=
--------
>=20
> If someone is facing the same problem, this could fixed by deleting the w=
hole content of the obj-directory.
>=20
> --Gordon
Yes I was about to reply, I still don't get what file is left over that res=
ults
into this issue so I can add it to the make clean hackery we have :(

Best regards,
Bapt

--44yvuvcsowe3zlep
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQIzBAABCAAdFiEEgOTj3suS2urGXVU3Y4mL3PG3PloFAl/2yagACgkQY4mL3PG3
PloTHxAAmT12zOq+Xjmo4R22tlR9PgbH3meoEr4TQj6sYS9/51PW/eOwyMUt8p9Y
9znN/A+hyqE3COpLB4JIcNS+niFGA5icaFqGmUmHTmadT4ME7qs6WujTQ9GplDrZ
kAu3HoWZz/UTSEaPSNELKgIlwWz7HdhWYkB7nXqlq6+sNKCfVRNNk7pB75EU0Wb2
yO6pq5fe18sxZ5i6DZZaKLOAMXiwrEiidduqXkCooSjCs9Q60DExaEhHWcZtOpEW
nLVuwd+suDRVXNUa6A4gra0QS893ZTd/PnQjKhSEiyOf7oLV8T6bwxLCAPF6cTUk
aTylo7hGaivnb86LkYoEcdVZWBmMyuxc4XyMPol/1L4k4bM5p54IEe6+Q2hiyDSt
DndyxFGAcNYUcZlJk4i+bI2SYaftoIikBOEWBfcx/y2aU2ZF1ptp7VisF9tWAfQq
HfOfQxT4uU3nxAS6dulilatcOJMRAEV0a2dFJ12Of9aYmeqNT63fCxNMoqnEc9Vw
tQwsLl2URxzKzZPAJCmXzL/aeoUf0E7MaGznJZcvMMtdAHqCsxj4qwpenvsDHJdd
nyPuy7PuK54rkjfvQP9ybh+rhaVtJYA4HWKNc4/QsuinRzZZRjVlQ07bIYfi3bnn
QcDUR2OQs4QjyQdIFItifpm/dT74qWw8LvqUMsgJ5KU0FlC75D0=
=z7JR
-----END PGP SIGNATURE-----

--44yvuvcsowe3zlep--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20210107084325.mbwynkmgadspbtlf>