From patchwork Wed Apr 8 17:19:46 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pedro Alves X-Patchwork-Id: 6089 Received: (qmail 56600 invoked by alias); 8 Apr 2015 17:19:52 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 56554 invoked by uid 89); 8 Apr 2015 17:19:52 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.4 required=5.0 tests=AWL, BAYES_00, KAM_LAZY_DOMAIN_SECURITY, SPF_HELO_PASS, T_RP_MATCHES_RCVD autolearn=no version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Wed, 08 Apr 2015 17:19:51 +0000 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t38HJoN5028791 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Wed, 8 Apr 2015 13:19:50 -0400 Received: from brno.lan (ovpn01.gateway.prod.ext.ams2.redhat.com [10.39.146.11]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t38HJm9b019273 for ; Wed, 8 Apr 2015 13:19:49 -0400 From: Pedro Alves To: gdb-patches@sourceware.org Subject: [PATCH 1/2] update-gnulib.sh: work around aclocal warning with Perl >= 5.16 Date: Wed, 8 Apr 2015 18:19:46 +0100 Message-Id: <1428513587-8471-2-git-send-email-palves@redhat.com> In-Reply-To: <1428513587-8471-1-git-send-email-palves@redhat.com> References: <1428513587-8471-1-git-send-email-palves@redhat.com> gdb/ChangeLog: 2015-04-08 Pedro Alves * gnulib/update-gnulib.sh (aclocal version check): Filter out "called too early to check prototype". --- gdb/gnulib/update-gnulib.sh | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) mode change 100644 => 100755 gdb/gnulib/update-gnulib.sh diff --git a/gdb/gnulib/update-gnulib.sh b/gdb/gnulib/update-gnulib.sh old mode 100644 new mode 100755 index 5c7238f..957c89a --- a/gdb/gnulib/update-gnulib.sh +++ b/gdb/gnulib/update-gnulib.sh @@ -110,7 +110,23 @@ if [ "$ver" != "$AUTOMAKE_VERSION" ]; then fi # Verify that we have the correct version of aclocal. -ver=`aclocal --version 2>&1 | head -1 | sed 's/.*) //'` +# +# The grep below is needed because Perl >= 5.16 dumps a "called too +# early to check prototype" warning when running aclocal 1.11.1. This +# causes trouble below, because the warning is the first line output +# by aclocal, resulting in: +# +# $ sh ./update-gnulib.sh ~/src/gnulib/src/ +# Error: Wrong aclocal version: called too early to check prototype at /opt/automake-1.11.1/bin/aclocal line 617.. Aborting. +# +# Some distros carry an automake patch for that: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=5;filename=aclocal-function-prototypes.debdiff;att=1;bug=752784 +# +# But since we prefer pristine FSF versions of autotools, work around +# the issue here. This can be removed later when we bump the required +# automake version. +# +ver=`aclocal --version 2>&1 | grep -v "called too early to check prototype" | head -1 | sed 's/.*) //'` if [ "$ver" != "$ACLOCAL_VERSION" ]; then echo "Error: Wrong aclocal version: $ver. Aborting." exit 1