From owner-freebsd-current@FreeBSD.ORG Fri Dec 2 19:22:10 2011 Return-Path: Delivered-To: freebsd-current@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7C063106566B; Fri, 2 Dec 2011 19:22:10 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 60D8B8FC14; Fri, 2 Dec 2011 19:22:10 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id pB2JMAt5037654; Fri, 2 Dec 2011 19:22:10 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id pB2JMAjK037653; Fri, 2 Dec 2011 19:22:10 GMT (envelope-from bapt@FreeBSD.org) X-Authentication-Warning: freefall.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f Date: Fri, 2 Dec 2011 20:22:06 +0100 From: Baptiste Daroussin To: obrien@FreeBSD.org, freebsd-current@FreeBSD.org Message-ID: <20111202192206.GB1913@azathoth.lan> References: <20111125190137.GA4420@azathoth.lan> <20111202071633.GD4444@dragon.NUXI.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="CUfgB8w4ZwR/yMy5" Content-Disposition: inline In-Reply-To: <20111202071633.GD4444@dragon.NUXI.org> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: Subject: Re: Upgrade contributed gperf, m4 and flex X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Dec 2011 19:22:10 -0000 --CUfgB8w4ZwR/yMy5 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Dec 01, 2011 at 11:16:33PM -0800, David O'Brien wrote: > On Fri, Nov 25, 2011 at 08:01:37PM +0100, Baptiste Daroussin wrote: > > and last: upgrade flex to the latest upstream version (it will need the= m4 > > upgrade) while here I'll move back flex to contrib/ > > patches can be found there:=20 > > http://people.freebsd.org/~bapt/flex-update.diff >=20 > Hi Baptiste, > I cannot tell from this what you are really doing. >=20 > It would likely be best to keep the old history, so that would involve > a 'svn move usr.bin/lex contrib/flex'. >=20 > Additionally if flex is now considered to be 3rd-party code (signified by > living in contrib/) it should be imported we into '$REPO/base/vendor'. >=20 > These actions would give a different diff than that above. >=20 > Do you have a diff that shows what the real changes to FreeBSD are? There are about no changes to FreeBSD, all the changes that were added in o= ur tree in the old version found their way into the upstream version I have two warning fixes, one in the generated code, and on the the flex code itself, = I'm planning to push them upstream. concerning the push into contrib, it was ju= st to try to do things the same way other contributed code are in our tree, maybe= I should just let it into the usr.bin/lex, I have no real opinion on this, I thought it would have been cleaner living in contrib. >=20 >=20 > > I also plan to upgrade m4 syncing code from openbsd, taking code from n= etbsd > > (improve gnu m4 compatibility). > > http://people.freebsd.org/~bapt/update_m4_from_openbsd_and_netbsd.diff >=20 > We don't seen to have '$REPO/base/vendor/OpenBSD/m4' as we likely should. > How different is our usr.bin/m4 from OpenBSD's? I didn't create a directory in vendor as our version is already from openbsd without the vendor entry, and lots of code like this one (ie from other bsd= ) do not have their entry in vendor, for example makefs and no one asked me to p= ush it into vendor/NetBSD at that time, once again if this the right way to do,= I'll create the OpenBSD/m4. Concerning the difference with the OpenBSD version this is only cosmetics a= nd warning fixes: function declared in a old fashion way, and small things like that, also took some fixes and way to build it from NetBSD (importing ohash which they took from OpenBSD). >=20 >=20 > > http://people.freebsd.org/~bapt/upgrade-gperf-to-3.0.3.diff >=20 > I assume an import into '$REPO/base/vendor/gperf/' will happen first? > ['$REPO/base/vendor/gperf/' needs to be "flattend out" first] > o I missed that one, I'll fix it as soon as possible. > thanks, Thanks for feedback. regards, Bapt --CUfgB8w4ZwR/yMy5 Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (FreeBSD) iEYEARECAAYFAk7ZJV4ACgkQ8kTtMUmk6EytjgCdG2PDPEGvQyDs7jr8kpVd8V/Z GoIAoLup4azxQVebkXUSo+nuIjPmZ4qV =oaqg -----END PGP SIGNATURE----- --CUfgB8w4ZwR/yMy5--