Patch for libobjc.
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
>> <[email protected]> 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/
>
2015-05-06 Michael Haubenwallner <[email protected]>
* aclocal.m4: Regenerated with automake-1.11.6.
Index: libobjc/aclocal.m4
===================================================================
--- libobjc/aclocal.m4 (revision 222804)
+++ libobjc/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.
@@ -13,12 +14,14 @@
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 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.
+# serial 1
+
# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
@@ -103,8 +106,8 @@
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
# From Jim Meyering
-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008,
+# 2011 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -124,7 +127,7 @@
[disable], [m4_define([am_maintainer_other], [enable])],
[m4_define([am_maintainer_other], [enable])
m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])])
-AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles])
+AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
dnl maintainer-mode's default is 'disable' unless 'enable' is passed
AC_ARG_ENABLE([maintainer-mode],
[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful
@@ -175,13 +178,13 @@
[m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
])
-# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2006, 2008, 2010 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.
-# serial 2
+# serial 3
# _AM_SUBST_NOTMAKE(VARIABLE)
# ---------------------------
@@ -190,7 +193,7 @@
AC_DEFUN([_AM_SUBST_NOTMAKE])
# AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
+# --------------------------
# Public sister of _AM_SUBST_NOTMAKE.
AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])