From owner-freebsd-stable@FreeBSD.ORG  Mon Jul  6 19:10:34 2009
Return-Path: <owner-freebsd-stable@FreeBSD.ORG>
Delivered-To: freebsd-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 86293106564A
	for <freebsd-stable@freebsd.org>; Mon,  6 Jul 2009 19:10:34 +0000 (UTC)
	(envelope-from luigi@onelab2.iet.unipi.it)
Received: from onelab2.iet.unipi.it (onelab2.iet.unipi.it [131.114.9.129])
	by mx1.freebsd.org (Postfix) with ESMTP id 4BDAF8FC19
	for <freebsd-stable@freebsd.org>; Mon,  6 Jul 2009 19:10:33 +0000 (UTC)
	(envelope-from luigi@onelab2.iet.unipi.it)
Received: by onelab2.iet.unipi.it (Postfix, from userid 275)
	id D5E4D73098; Mon,  6 Jul 2009 21:16:17 +0200 (CEST)
Date: Mon, 6 Jul 2009 21:16:17 +0200
From: Luigi Rizzo <rizzo@iet.unipi.it>
To: Bruce Simpson <bms@incunabulum.net>
Message-ID: <20090706191617.GC35071@onelab2.iet.unipi.it>
References: <4A520A69.4010000@incunabulum.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <4A520A69.4010000@incunabulum.net>
User-Agent: Mutt/1.4.2.3i
Cc: freebsd-stable <freebsd-stable@freebsd.org>
Subject: Re: Merging a GCC bug fix to RELENG_7 - how?
X-BeenThere: freebsd-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Production branch of FreeBSD source code <freebsd-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>, 
	<mailto:freebsd-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-stable>
List-Post: <mailto:freebsd-stable@freebsd.org>
List-Help: <mailto:freebsd-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>,
	<mailto:freebsd-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 06 Jul 2009 19:10:34 -0000

On Mon, Jul 06, 2009 at 03:30:01PM +0100, Bruce Simpson wrote:
> Hi all,
> 
> This GCC bug bites us in the Boost regression tests in a number of places.
> 
> Uh oh, I've stepped on the one-line fix bomb:
>    http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31899
>    http://gcc.gnu.org/viewcvs?view=rev&revision=129199
> 
> What's funny is that COPYING in the root of that branch is GPLv2, but 
> the affected file's license is GPLv3.
> 
> So what on earth do we do?

the whole change is one line

-    gcc_unreachable ();
+    return *tp;

and according to the dates bugzilla and the repository,
when the patch was submitted the file was still marked as GPLv2.

So I would think that taking the v2 file and the v2 patch
still makes a v2 file, doesn't it ?

cheers
luigi