From owner-cvs-src@FreeBSD.ORG  Wed Feb  1 08:03:03 2006
Return-Path: <owner-cvs-src@FreeBSD.ORG>
X-Original-To: cvs-src@freebsd.org
Delivered-To: cvs-src@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 519CD16A420;
	Wed,  1 Feb 2006 08:03:03 +0000 (GMT)
	(envelope-from stefan@fafoe.narf.at)
Received: from viefep17-int.chello.at (viefep17-int.chello.at [213.46.255.23])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8F2F043D46;
	Wed,  1 Feb 2006 08:03:01 +0000 (GMT)
	(envelope-from stefan@fafoe.narf.at)
Received: from wombat.fafoe.narf.at ([213.47.85.26]) by viefep17-int.chello.at
	(InterMail vM.6.01.04.04 201-2131-118-104-20050224) with ESMTP id
	<20060201080259.SFBO6330.viefep17-int.chello.at@wombat.fafoe.narf.at>;
	Wed, 1 Feb 2006 09:02:59 +0100
Received: by wombat.fafoe.narf.at (Postfix, from userid 1001)
	id 79E3CBFB4; Wed,  1 Feb 2006 09:02:58 +0100 (CET)
Date: Wed, 1 Feb 2006 09:02:58 +0100
From: Stefan Farfeleder <stefan@fafoe.narf.at>
To: "M. Warner Losh" <imp@bsdimp.com>
Message-ID: <20060201080250.GA610@wombat.fafoe.narf.at>
References: <200601311757.k0VHvHuF060699@repoman.freebsd.org>
	<20060131.121247.100359574.imp@bsdimp.com>
	<20060131.135734.112813988.imp@bsdimp.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20060131.135734.112813988.imp@bsdimp.com>
User-Agent: Mutt/1.5.11
Cc: cvs-src@freebsd.org, stefanf@freebsd.org, src-committers@freebsd.org,
	cvs-all@freebsd.org
Subject: Re: cvs commit: src/sys/sys cdefs.h src/include nl_types.h stdio.h
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Feb 2006 08:03:03 -0000

On Tue, Jan 31, 2006 at 01:57:34PM -0700, M. Warner Losh wrote:

> Confirmed.  RELENG_5 -> RELENG_6 upgrades are now broken.

> ===> usr.bin/gencat (obj,depend,all,install)

> 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
> 
> The fix I have applied locally is:

> @@ -97,6 +97,9 @@
>  
>  __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
> 
> although I'm sure that there's many ways to skin this cat...

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?

Anyway this probably won't be fixed very soon, so should I commit something
like your patch or back out the whole thing?

Stefan