diff mbox

[3/28] fixincludes: Use automake-1.11.6 (across the tree)

Message ID 5549D7C3.7060205@ssi-schaefer.com
State New
Headers show

Commit Message

Michael Haubenwallner May 6, 2015, 8:58 a.m. UTC 
Trivial patch for fixincludes.

Am 2015-05-05 um 18:03 schrieb Michael Haubenwallner:
> Hello build machinery maintainers,
> 
> following up
> http://thread.gmane.org/gmane.comp.gcc.patches/331902/focus=334462
> http://thread.gmane.org/gmane.comp.gcc.patches/332160
> 
> On 01/25/2015 08:42 PM, Jan-Benedict Glaw wrote:
>> On Sun, 2015-01-04 20:20:40 +0100, Michael Haubenwallner <michael.haubenwallner@ssi-schaefer.com> wrote:
> 
>>> Updating to 1.14 might require more work like updating some .in
>>> files as well. I've seen automake-1.11 being explicitly used, so for
>>> now we really want 1.11.6 eventually?
>>
>> Probably yes, we may want to stick to a well-known version. (Maybe
>> another way could be to really upgrade to current versions, with is, I
>> guess, more work than just sync files and rerun. That might be
>> fruitful (ie. to not stick to older versions), but this is a change I
>> don't see in the current stage.)
>>
>>   To cut a long story short:
>>
>>   * Do we actually see *problems* from the version inconsistencies
>>     already introduced by me and/or others?
> 
> There's a problem for gcc-developers: When I need to import a libtool
> upstream patch, by its nature it affects each library. As I prefer to
> avoid mixing these diffs with an automake version change in one commit,
> I need to bootstrap different libraries with different automake versions.
> 
> Even if I probably need to split this change into one commit per library
> anyway, the need for multiple automake versions still feels pointless.
> 
>>   * ...and: Do we want to stick to known versions, or update if?
>>     (Probably not in such a late stage, though...)
> 
> Now that gcc-5 is out, what about an automake-1.11.6 update for gcc-6?
> 
> BTW, the actual commands I use to re-run automake for everything (I found) is:
>   $ export AUTOMAKE='automake-1.11 --add-missing --copy --force-missing'
>   $ /src/gcc-trunk/configure --prefix=/install \
>       --enable-languages=c,c++,fortran,go,java,lto,objc,obj-c++ \
>       --enable-liboffloadmic=target \
>       --enable-libmpx \
>       --enable-maintainer-mode 
>   $ make bootstrap
> 
> Thanks!
> /haubi/
>

Comments

Bruce Korb May 7, 2015, 10:10 p.m. UTC | #1 
On 05/06/15 01:58, Michael Haubenwallner wrote:
> Trivial patch for fixincludes.

A) sufficiently trivial that explicit permission ought not be required
B) it is now officially blessed that we can coalesce year lists.
    Let's do so, okay?

> Am 2015-05-05 um 18:03 schrieb Michael Haubenwallner:
>> Hello build machinery maintainers,

>> BTW, the actual commands I use to re-run automake for everything (I found) is:
>>    $ export AUTOMAKE='automake-1.11 --add-missing --copy --force-missing'
>>    $ /src/gcc-trunk/configure --prefix=/install \
>>        --enable-languages=c,c++,fortran,go,java,lto,objc,obj-c++ \
>>        --enable-liboffloadmic=target \
>>        --enable-libmpx \
>>        --enable-maintainer-mode
Michael Haubenwallner May 8, 2015, 9:26 a.m. UTC | #2 
On 05/08/2015 12:10 AM, Bruce Korb wrote:
> On 05/06/15 01:58, Michael Haubenwallner wrote:
>> Trivial patch for fixincludes.
> 
> A) sufficiently trivial that explicit permission ought not be required

Agreed for the actual code change - more important is to notify the automake revbump.

> B) it is now officially blessed that we can coalesce year lists.
>    Let's do so, okay?

Not for aclocal.m4, which is generated by automake - where 1.11.6 does not coalesce years.

/haubi/
diff mbox

Patch

2015-05-06  Michael Haubenwallner <michael.haubenwallner@ssi-schaefer.com>

	Use automake-1.11.6.
	aclocal.m4: Recreate.

Index: fixincludes/aclocal.m4
===================================================================
--- fixincludes/aclocal.m4	(revision 222804)
+++ fixincludes/aclocal.m4	(working copy)
@@ -1,7 +1,8 @@ 
-# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
+# Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.