diff mbox

[0/29] RFC: Use automake-1.11.6 across the tree

Message ID 554B8A11.7080401@ssi-schaefer.com
State New
Headers show

Commit Message

Michael Haubenwallner May 7, 2015, 3:51 p.m. UTC 
On 05/06/2015 04:09 PM, Jeff Law wrote:
> On 05/05/2015 10:03 AM, Michael Haubenwallner wrote:
>> 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
>>
> [ ... snip ... ]
>> 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
> 
> Are there any cases where you had to do something other than just regenerate the various files?

Nope - at least nothing that I would call "doing something other". What I did:
* touch each configure.ac to ensure automake is really used
* do 'make bootstrap' with one single job (updating scripts while running them is bad)
* once-off add "testsuite/other-tests/Makefile" to AC_CONFIG_FILES in libvtv/configure.ac,
  as that is unused but shows up in the "by automake 1.11.x" search

> If not, then as long as you fix the ChangeLog entries per Jakub's comments and ensure that you've also tested Ada, then this can be installed into the trunk.

Sure, and two more:
* Sort out whether to update those top-level "missing" scripts.
* Bump to automake 1.11.6 even in gcc/doc/install.texi, patch attached.

> Do you have write access to the repository?

Yes.

Thanks!
/haubi/

Comments

Jeff Law May 8, 2015, 6:49 p.m. UTC | #1 
On 05/07/2015 09:51 AM, Michael Haubenwallner wrote:
>>
>> Are there any cases where you had to do something other than just regenerate the various files?
>
> Nope - at least nothing that I would call "doing something other". What I did:
> * touch each configure.ac to ensure automake is really used
> * do 'make bootstrap' with one single job (updating scripts while running them is bad)
> * once-off add "testsuite/other-tests/Makefile" to AC_CONFIG_FILES in libvtv/configure.ac,
>    as that is unused but shows up in the "by automake 1.11.x" search
>
>> If not, then as long as you fix the ChangeLog entries per Jakub's comments and ensure that you've also tested Ada, then this can be installed into the trunk.
>
> Sure, and two more:
> * Sort out whether to update those top-level "missing" scripts.
Seems like we should if they came from automake.

> * Bump to automake 1.11.6 even in gcc/doc/install.texi, patch attached.
Yup.

Presumably there's some reason why we're not stepping to 1.12 that I 
missed in the discussion?

Jeff
Joseph Myers May 8, 2015, 8:22 p.m. UTC | #2 
On Fri, 8 May 2015, Jeff Law wrote:

> > * Sort out whether to update those top-level "missing" scripts.
> Seems like we should if they came from automake.

I say we should *update* (from git).  Not *downgrade to an older version*, 
which is what the posted patch did.
Jeff Law May 8, 2015, 8:48 p.m. UTC | #3 
On 05/08/2015 02:22 PM, Joseph Myers wrote:
> On Fri, 8 May 2015, Jeff Law wrote:
>
>>> * Sort out whether to update those top-level "missing" scripts.
>> Seems like we should if they came from automake.
>
> I say we should *update* (from git).  Not *downgrade to an older version*,
> which is what the posted patch did.
If we're downgrading, then yea, that seems backwards.

jeff
diff mbox

Patch

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

	* doc/install.texi: Bump latest automake 1.11 version to 1.11.6.

Index: gcc/doc/install.texi
===================================================================
--- gcc/doc/install.texi	(revision 222804)
+++ gcc/doc/install.texi	(working copy)
@@ -403,7 +403,7 @@ 
 Necessary when modifying @file{configure.ac}, @file{aclocal.m4}, etc.@:
 to regenerate @file{configure} and @file{config.in} files.
 
-@item automake version 1.11.1
+@item automake version 1.11.6
 
 Necessary when modifying a @file{Makefile.am} file to regenerate its
 associated @file{Makefile.in}.
@@ -414,7 +414,7 @@ 
 as any of their subdirectories.
 
 For directories that use automake, GCC requires the latest release in
-the 1.11 series, which is currently 1.11.1.  When regenerating a directory
+the 1.11 series, which is currently 1.11.6.  When regenerating a directory
 to a newer version, please update all the directories using an older 1.11
 to the latest released version.