Date: Wed, 1 Feb 2006 13:25:13 +0200 From: Ruslan Ermilov <ru@FreeBSD.org> To: Stefan Farfeleder <stefan@fafoe.narf.at> Cc: cvs-src@FreeBSD.org, stefanf@FreeBSD.org, cvs-all@FreeBSD.org, "M. Warner Losh" <imp@bsdimp.com>, src-committers@FreeBSD.org Subject: Re: cvs commit: src/sys/sys cdefs.h src/include nl_types.h stdio.h Message-ID: <20060201112513.GH90360@ip.net.ua> In-Reply-To: <20060201080250.GA610@wombat.fafoe.narf.at> References: <200601311757.k0VHvHuF060699@repoman.freebsd.org> <20060131.121247.100359574.imp@bsdimp.com> <20060131.135734.112813988.imp@bsdimp.com> <20060201080250.GA610@wombat.fafoe.narf.at>
next in thread | previous in thread | raw e-mail | index | archive | help
--e5bfZ/T2xnjpUIbw Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Feb 01, 2006 at 09:02:58AM +0100, Stefan Farfeleder wrote: > On Tue, Jan 31, 2006 at 01:57:34PM -0700, M. Warner Losh wrote: >=20 > > Confirmed. RELENG_5 -> RELENG_6 upgrades are now broken. >=20 > > =3D=3D=3D> usr.bin/gencat (obj,depend,all,install) >=20 > > In file included from /u2/imp/FreeBSD/6x/src/usr.bin/gencat/gencat.c:88: > > /u2/imp/obj/u2/imp/FreeBSD/6x/src/tmp/legacy/usr/include/nl_types.h:100= : error: syntax error before "__format_arg" > > *** Error code 1 > >=20 > > The fix I have applied locally is: >=20 > > @@ -97,6 +97,9 @@ > > =20 > > __BEGIN_DECLS > > nl_catd catopen(const char *, int); > > +#ifndef __format_arg > > +#define __format_arg(a) __attribute__((__format_arg__(a))) > > +#endif > > char *catgets(nl_catd, int, int, const char *) __format_arg(4); > > int catclose(nl_catd); > > __END_DECLS > >=20 > > although I'm sure that there's many ways to skin this cat... >=20 > This patch kind of defeats the purpose of my commit. Why is gencat > picking up the new <nl_tpes.h> but the old <sys/cdefs.h>? Shouldn't there > be a "-I /u2/[...]/src/tmp/legacy/usr/include/sys" somewhere? >=20 Because attempting to use a new cdefs.h will likely break it in other way. This tool is compiled from fresh sources but using the currently available toolchain because it's compiled to be run on the host/OS/version doing buildworld, and it meant to be run during buildworld. > Anyway this probably won't be fixed very soon, so should I commit somethi= ng > like your patch or back out the whole thing? >=20 Commit what Warner sent you, but only to RELENG_6. Cheers, --=20 Ruslan Ermilov ru@FreeBSD.org FreeBSD committer --e5bfZ/T2xnjpUIbw Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (FreeBSD) iD8DBQFD4JqZqRfpzJluFF4RAqzUAKCJM1fCkOaZBC8DOFp/+BAYE6RA9gCgkWIJ NuX5oDom5FpZwh3uD2AtpPg= =wIjx -----END PGP SIGNATURE----- --e5bfZ/T2xnjpUIbw--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060201112513.GH90360>