From owner-dev-commits-src-all@freebsd.org Tue Jan 5 17:49:50 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 37DA14C4306; Tue, 5 Jan 2021 17:49:50 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 4D9Kl20NJqz4nlr; Tue, 5 Jan 2021 17:49:50 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from ivaldir.etoilebsd.net (etoilebsd.net [178.32.217.76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: bapt) by smtp.freebsd.org (Postfix) with ESMTPSA id C7DDD774; Tue, 5 Jan 2021 17:49:49 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: by ivaldir.etoilebsd.net (Postfix, from userid 1001) id 2E1D0EA9AA; Tue, 5 Jan 2021 18:49:46 +0100 (CET) Date: Tue, 5 Jan 2021 18:49:46 +0100 From: Baptiste Daroussin To: Cy Schubert 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: <20210105174946.cipkku7f2bhqaq4r@ivaldir.net> References: <202101051302.105D24lW041218@gitrepo.freebsd.org> <202101051440.105EefY4071731@slippy.cwsent.com> <20210105144839.73qamvxrnhxpd3nk@ivaldir.net> <202101051535.105FZDAX036599@slippy.cwsent.com> <202101051732.105HW1r9003463@slippy.cwsent.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="yds57fw44r56gk43" Content-Disposition: inline In-Reply-To: <202101051732.105HW1r9003463@slippy.cwsent.com> 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: Tue, 05 Jan 2021 17:49:50 -0000 --yds57fw44r56gk43 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Jan 05, 2021 at 09:32:01AM -0800, Cy Schubert wrote: > In message <202101051535.105FZDAX036599@slippy.cwsent.com>, Cy Schubert= =20 > writes: > > In message <20210105144839.73qamvxrnhxpd3nk@ivaldir.net>, Baptiste=20 > > Daroussin wr > > ites: > > >=20 > > > --yj2rojvagivjcjon > > > Content-Type: text/plain; charset=3Dus-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>, Bapti= ste=3D20 > > > > Daroussi > > > > n writes: > > > > > The branch main has been updated by bapt: > > > > > > > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=3D3D821aa63a09402935= da0a73ab > > =3D > > > f20ba044 > > > > > 1562aa07 > > > > > > > > > > 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 > > > > > =3D20 > > > > > Only keep the widechar version of ncurses as libncursesw.so.9 > > > > > =3D20 > > > > > Keep the old name to avoid breaking the ABI compatibility (th= e non > > > > > widechar version libncurses.so.9 is not binary compatible with > > > > > libncursesw.so.9) since all ports and base are already only l= inking > > > > > against the widechar version we can simply remove libncurses.= so.9 > > > > > =3D20 > > > > > Since the .9 version only lived in the dev branch and never e= nded i > > =3D > > > n a > > > > > release, it is simply removed and not added to any binary com= pat > > > > > package. > > > > > =3D20 > > > > > Add symlinks to keep build time compatibility for anyone link= ing ag > > =3D > > > ainst > > > > > -lncurses > > [...] > > > >=3D20 > > > > This fails to build in compat32. > > > >=3D20 > > > > --- lib/libthr__L --- > > > > install -U -s -o root -g wheel -m 444 -S libthr.so.3=3D20 > > > > /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: err= or:=3D20 > > > > unknown type name 'mbstate_t'; did you mean '__mbstate_t'? > > > > extern NCURSES_EXPORT(size_t) _nc_wcrtomb (char *, wchar_t, mbstate= _t *); > > > > ^~~~~~~= ~~ > > > > __mbsta= te_t > > > > /export/obj/opt/src/git-src/amd64.amd64/obj-lib32/tmp/usr/include/s= ys/_ty > > =3D > > > pes > > > > .h:124:3: note: '__mbstate_t' declared here > > > > } __mbstate_t; > > > > ^ > > > > /opt/src/git-src/contrib/ncurses/ncurses/widechar/charable.c:42:15:= error > > =3D > > > :=3D20 > > > > implicit declaration of function 'wctob' is invalid in C99=3D20 > > > > [-Werror,-Wimplicit-function-declaration] > > > > result =3D3D (wctob((wint_t) ch) =3D3D=3D3D (int) ch); > > > > ^ > > > > /opt/src/git-src/contrib/ncurses/ncurses/widechar/charable.c:42:15:= note: > > =3D > > > =3D20 > > > > did you mean 'wctomb'? > > > > /export/obj/opt/src/git-src/amd64.amd64/obj-lib32/tmp/usr/include/s= tdlib. > > =3D > > > 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 > > =3D > > > :=3D20 > > > > use of undeclared identifier 'wint_t' > > > > result =3D3D (wctob((wint_t) ch) =3D3D=3D3D (int) ch); > > > > ^ > > > > /opt/src/git-src/contrib/ncurses/ncurses/widechar/charable.c:49:33:= error > > =3D > > > :=3D20 > > > > 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 > > =3D > > > :=3D20 > > > > implicit declaration of function 'wctob' is invalid in C99=3D20 > > > > [-Werror,-Wimplicit-function-declaration] > > > > result =3D3D wctob(ch); > > > > ^ > > > > /opt/src/git-src/contrib/ncurses/ncurses/widechar/charable.c:67:16:= error > > =3D > > > :=3D20 > > > > 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=3D20 > > > > /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 > > =3D > > > :=3D20 > > > > expected ';' after expression > > > > wint_t result; > > > > ^ > > > > ; > > > > --- cddl/lib/libnvpair__L --- > > > > install -U -o root -g wheel -m 444 libnvpair.so.2.debug=3D20 > > > > /export/obj/opt/src/git-src/amd64.amd64/obj-lib32/tmp/usr/lib/debug= /usr/l > > =3D > > > ib3 > > > > 2/ > > > > --- lib/ncurses/ncurses__L --- > > > > /opt/src/git-src/contrib/ncurses/ncurses/widechar/charable.c:69:5: = error: > > =3D > > > =3D20 > > > > use of undeclared identifier 'wint_t' > > > > wint_t result; > > > > ^ > > > > /opt/src/git-src/contrib/ncurses/ncurses/widechar/charable.c:69:12:= error > > =3D > > > :=3D20 > > > > use of undeclared identifier 'result' > > > > wint_t result; > > > > ^ > > > > /opt/src/git-src/contrib/ncurses/ncurses/widechar/charable.c:71:5: = error: > > =3D > > > =3D20 > > > > use of undeclared identifier 'result' > > > > result =3D3D btowc(ch); > > > > ^ > > > > /opt/src/git-src/contrib/ncurses/ncurses/widechar/charable.c:71:14:= error > > =3D > > > :=3D20 > > > > implicit declaration of function 'btowc' is invalid in C99=3D20 > > > > [-Werror,-Wimplicit-function-declaration] > > > > result =3D3D btowc(ch); > > > > ^ > > > > /opt/src/git-src/contrib/ncurses/ncurses/widechar/charable.c:71:14:= note: > > =3D > > > =3D20 > > > > did you mean 'mbtowc'? > > > > /export/obj/opt/src/git-src/amd64.amd64/obj-lib32/tmp/usr/include/s= tdlib. > > =3D > > > 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 > > =3D > > > :=3D20 > > > > use of undeclared identifier 'result' > > > > return result; > > > > ^ > > > > 14 errors generated. > > > > *** [charable.o] Error code 1 > > > >=3D20 > > > > make[4]: stopped in /opt/src/git-src/lib/ncurses/ncurses > > > > 1 error > > > >=3D20 > > > > 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=3D20 > > > > /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=3D20 > > > > /export/obj/opt/src/git-src/amd64.amd64/obj-lib32/tmp/usr/lib/debug= /usr/l > > =3D > > > ib3 > > > > 2/ > > > > --- cddl/lib/libspl__L --- > > > > install -U -o root -g wheel -m 444 libspl.so.2.debug=3D20 > > > > /export/obj/opt/src/git-src/amd64.amd64/obj-lib32/tmp/usr/lib/debug= /usr/l > > =3D > > > ib3 > > > > 2/ > > > > --- lib/libthr__L --- > > > > --- cddl/lib/libnvpair__L --- > > > > install -U -l rs -o root -g wheel -m 755 -S libnvpair.so.2=3D20 > > > > /export/obj/opt/src/git-src/amd64.amd64/obj-lib32/tmp/usr/lib32/lib= nvpair > > =3D > > > =3D2Eso > > > > *** [build32] Error code 2 > > > >=3D20 > > > > make[1]: stopped in /opt/src/git-src > > > > 1 error > > > >=3D20 > > > > make[1]: stopped in /opt/src/git-src > > > > exiting RC=3D3D2: building amd64 > > > > slippy#=3D20 > > > >=3D20 > > > >=3D20 > > > > > > Weird are you building with -DNO_CLEAN ? or clean build ? > > > > NO_CLEAN build. Do you think we need circumvention shim or an UPDATING= =20 > > entry? >=20 > I'm seeing the following poudriere failure post installing this into a=20 > poudriere jail. >=20 > cd xxd; CC=3D"cc" CFLAGS=3D"-DLIBICONV_PLUG -I/usr/local/include -O2 -pip= e=20 > -Wno-misleading-indentation -Wno-tautological-overlap-compare =20 > -DLIBICONV_PLUG -fstack-protector-strong -fno-strict-aliasing =20 > -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3D1" LDFLAGS=3D"-L. =20 > -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" =20 > /usr/bin/make -f Makefile > cc -DLIBICONV_PLUG -I/usr/local/include -O2 -pipe -Wno-misleading-indenta= tio > n -Wno-tautological-overlap-compare -DLIBICONV_PLUG=20 > -fstack-protector-strong -fno-strict-aliasing -U_FORTIFY_SOURCE=20 > -D_FORTIFY_SOURCE=3D1 -Wno-misleading-indentation -Wno-tautological-overl= ap-co > mpare -L. -fstack-protector-strong -rdynamic -Wl,-R/usr/local/lib/perl= 5/5 > .32/mach/CORE -fstack-protector-strong -L/usr/local/lib -Wl,--as-neede= d=20 > -DUNIX -o xxd xxd.c > OLD_PO_FILE_INPUT=3Dyes msgfmt -v -o af.mo af.po > ld-elf.so.1: Shared object "libncurses.so.9" not found, required by=20 > "libtextstyle.so.0" > *** Error code 1 >=20 > Stop. > make[3]: stopped in /wrkdirs/usr/ports/editors/vim/work/vim-8.2.2263/src/= po > *** Error code 1 >=20 > Stop. > make[2]: stopped in /wrkdirs/usr/ports/editors/vim/work/vim-8.2.2263/src > *** Error code 1 >=20 > Stop. > make[1]: stopped in /wrkdirs/usr/ports/editors/vim/work/vim-8.2.2263 > *** Error code 1 >=20 > Stop. > make: stopped in /usr/ports/editors/vim > =3D>> Cleaning up wrkdir > =3D=3D=3D> 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 !!! >=20 > devel/libtextstyle looks like it needs a rebuild. We probably need=20 > __FreeBSD_version bump to force a poudriere rebuild too. >=20 Fixed Best regards, Bapt --yds57fw44r56gk43 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEgOTj3suS2urGXVU3Y4mL3PG3PloFAl/0prcACgkQY4mL3PG3 PlqcFg/+IPfhQ2ziFf88zSUgD199GQpqRF1f0HgjlI4CuIWP78XYL4NzVN6T8rEK 47a20Lw/dj+nyEZHQkOGVtjbb6rwCZuwC55Y09Y9+NPpMUUNKLU7g7KW8h8q8Mkr Vt5K7LixjFEh38hJpS0pqztn0EqEB0nCsJsJhLTbCk99YPA3RNw3R1fEPVBNTEpl dLx0QIwbPHx1Zz8MomOTr6IvPhABmv3XKCbzeO7HieTRll8os8RejCirW1+DI5pr /3kzpQAIEKZbnB7kIw3wywTjAcoqNWfctj02IzQP9hHZXhvmdDR0po9kiWUN+SaH V4TkpRhnTEgx+Mpn/TldKMfdDvgfVwF3+uBdzuGJgPRNDH4JLXP/ntv3qHWJGGoi 3fK73kQG6PAzAGAZcqCwT4/oMyQuIicMLGqIo/JAdX+pn+wnLUZ6CAYKw94Syid0 1873A+aBJMrr2NQPNJ9WrLhMf6+OknOVhDZqR137o5Jdhj/WxAqiJjFaDbxTxDrV p4bHazJ6/xcJ6GUB2iMOFlC8Z+Tj9MDzP3sPt2hqY9v+GaalLYVs6TZvlj7IsLro 9Yf/lqYjxywjgTBXjTsIY1bSn1EmB3eESMobeFKq6FZ1DDv+Qcf6aksK+lrWZWN6 QdWIUhTCwcs0v/Y4TTTUflgxhX+O4k0eUx3XPX0Nt+puJ2LR+u8= =7C/1 -----END PGP SIGNATURE----- --yds57fw44r56gk43--