From owner-dev-commits-src-all@freebsd.org Wed Jan 6 15:29:35 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 425BF4D4706; Wed, 6 Jan 2021 15:29:35 +0000 (UTC) (envelope-from gbe@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D9tZl1RJpz4S8q; Wed, 6 Jan 2021 15:29:35 +0000 (UTC) (envelope-from gbe@freebsd.org) Received: from localhost (p200300d5d72fc8e88d2762c8763f258e.dip0.t-ipconnect.de [IPv6:2003:d5:d72f:c8e8:8d27:62c8:763f:258e]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: gbe) by smtp.freebsd.org (Postfix) with ESMTPSA id 9775EB451; Wed, 6 Jan 2021 15:29:34 +0000 (UTC) (envelope-from gbe@freebsd.org) Date: Wed, 6 Jan 2021 16:29:32 +0100 From: Gordon Bergling To: Baptiste Daroussin 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: References: <202101051302.105D24lW041218@gitrepo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202101051302.105D24lW041218@gitrepo.freebsd.org> X-Url: X-Operating-System: FreeBSD 12.2-STABLE amd64 X-Host-Uptime: 4:20PM up 2 days, 18:25, 4 users, load averages: 0.31, 0.29, 0.25 X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Jan 2021 15:29:35 -0000 On Tue, Jan 05, 2021 at 01:02:04PM +0000, Baptiste Daroussin wrote: > The branch main has been updated by bapt: > > URL: https://cgit.FreeBSD.org/src/commit/?id=821aa63a09402935da0a73abf20ba0441562aa07 > > commit 821aa63a09402935da0a73abf20ba0441562aa07 > Author: Baptiste Daroussin > AuthorDate: 2021-01-04 16:29:40 +0000 > Commit: Baptiste Daroussin > 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 in a > release, it is simply removed and not added to any binary compat > package. > > 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(-) [...] This also breaks the build on arm64. I had NO_CLEAN=yes applied, but this error is generated after a 'make clean cleandepend'. The src.conf is the following, WITH_MALLOC_PRODUCTION=1 WITH_EXTRA_TCP_STACKS=1 WITH_BEARSSL=1 WITH_PIE=1 WITH_RETPOLINE=1 Is there anything else I can do? ------------------------------------------------------------------------------- ===> 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/usr/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 = 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 = 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(value)) ~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~ ------------------------------------------------------------------------------- --Gordon