From owner-freebsd-hackers@FreeBSD.ORG Fri Apr 9 22:01:30 2004 Return-Path: Delivered-To: freebsd-hackers@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 543F016A4CE; Fri, 9 Apr 2004 22:01:30 -0700 (PDT) Received: from smtp4.server.rpi.edu (smtp4.server.rpi.edu [128.113.2.4]) by mx1.FreeBSD.org (Postfix) with ESMTP id CE28D43D1F; Fri, 9 Apr 2004 22:01:29 -0700 (PDT) (envelope-from gad@FreeBSD.org) Received: from [128.113.24.47] (gilead.netel.rpi.edu [128.113.24.47]) by smtp4.server.rpi.edu (8.12.8/8.12.8) with ESMTP id i3A51RFR008230; Sat, 10 Apr 2004 01:01:27 -0400 Mime-Version: 1.0 X-Sender: gad@gilead.netel.rpi.edu (Unverified) Message-Id: In-Reply-To: <20040409205016.GA6183@isis.wad.cz> References: <20040409205016.GA6183@isis.wad.cz> Date: Sat, 10 Apr 2004 01:01:26 -0400 To: Roman Neuhauser , hackers@FreeBSD.org, peter@FreeBSD.org From: Garance A Drosehn Content-Type: text/plain; charset="us-ascii" ; format="flowed" X-Scanned-By: CanIt (www . canit . ca) Subject: Re: MFCs needed in src/sys/sys/cdefs.h X-BeenThere: freebsd-hackers@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Technical Discussions relating to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 Apr 2004 05:01:30 -0000 At 10:50 PM +0200 4/9/04, Roman Neuhauser wrote: >This is an extended version of my previous email to hackers@ >which hasn't attracted any attention. This time I'm mailing >the authors too. I must have missed the earlier message... >Two revisions need MFC in src/sys/sys/cdefs.h: > >http://www.freebsd.org/cgi/cvsweb.cgi/src/sys/sys/cdefs.h.diff?r1=1.78&r2=1.79 > >Silences gobs of warnings in just about any libtool-using software. > >Fix for CURRENT commited: (5 months, 1 week ago) by peter. I have no opinion on this. It looks fine to me. >http://www.freebsd.org/cgi/cvsweb.cgi/src/sys/sys/cdefs.h.diff?r1=1.74&r2=1.75 > >This one fixes __RCSID(), __RCSID_SOURCE(), etc in the same >manner as __FBSDID(). The commit message even says it should >be MFCed after one week, but that never happened. > >Commited (8 months, 2 weeks ago) by gad. When I went to MFC this, I found out that cdefs in -stable was different enough to cdefs in -current that this was not a simple MFC. That update modified lines added by earlier changes which had not been MFC'ed. After talking about it with BDE, we felt that it was more trouble than it was worth to sort out what should and should not be MFC'ed. Note, for instance, that the lines which are replaced by r1.75 do not even exist in cdefs.h for release 4.x. The update fixes the handling of the NO__RCSID, NO__RCSID_SOURCE, NO__SCCSID, and NO_COPYRIGHT options -- and 4.x does not have any of those NO__* options. In fact, it doesn't have the __SCCSID macro, never mind the NO__SCCSID option to nullify that macro... It would be easy enough to write a minimal update for 4.x that would "add and then fix" those options. But right now I am really over-committed and over-tired. I also do not see much urgency in MFC'ing a fix for bugs that do not exist in -stable... It would have been much nicer if you had gotten my attention about this a few weeks ago. We are now *in* the code-freeze for 4.x, so I'll have to see what re@ thinks about it. I could also pick up Peter's update, if he wanted me to. -- Garance Alistair Drosehn = gad@gilead.netel.rpi.edu Senior Systems Programmer or gad@FreeBSD.org Rensselaer Polytechnic Institute; Troy, NY; USA