From patchwork Tue May 29 19:32:45 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 161790 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id 1EC2BB6FA9 for ; Wed, 30 May 2012 05:33:36 +1000 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1338924817; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: From:To:Cc:Subject:In-Reply-To:References:User-Agent:Date: Message-ID:MIME-Version:Content-Type:Mailing-List:Precedence: List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender: Delivered-To; bh=yJGrAOKn4gNWF/wR67rFcq3lEhI=; b=HCPnClq7UDb2Ewq wqX3WMnKxsOID93WbMk+QsiHuz8Sb3yqZuuKJ1AxAeOhh09zjj8yE83n2cnTBDBI 5WGtvlXQSd0YBVm4xW0kzfC5yY08b4rDCmaMYb7yCqe3XWlJfjhQVDjz3+R3r40m kH+dPl1+2YeZhfX3wu7hfJl/GjRs= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:Received:From:To:Cc:Subject:In-Reply-To:References:User-Agent:Date:Message-ID:MIME-Version:Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=rDIkPFCrGOl3/ekcCM1dGN/K6ru52H+i0t7JxDbHyq9BGALyPNPjDBvf5Z4zyz 8Bogpt12iERb5MH5B4NiGHJrkmoOrucfXzeHJC3cOo7LoKnljNqdW+T+gxkLReoV iDZsZQyEAv7UC1nK8TjvfFb9ecI59W7uXMr40il/qDQDc=; Received: (qmail 13996 invoked by alias); 29 May 2012 19:33:28 -0000 Received: (qmail 13956 invoked by uid 22791); 29 May 2012 19:33:20 -0000 X-SWARE-Spam-Status: No, hits=-6.5 required=5.0 tests=AWL, BAYES_50, KHOP_PGP_SIGNED, KHOP_RCVD_UNTRUST, KHOP_THREADED, RCVD_IN_HOSTKARMA_W, RCVD_IN_HOSTKARMA_WL X-Spam-Check-By: sourceware.org Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 29 May 2012 19:33:07 +0000 Received: from nat-ies.mentorg.com ([192.94.31.2] helo=EU1-MAIL.mgc.mentorg.com) by relay1.mentorg.com with esmtp id 1SZSAB-0000Ko-Bx from Thomas_Schwinge@mentor.com ; Tue, 29 May 2012 12:33:03 -0700 Received: from feldtkeller.schwinge.homeip.net ([172.30.72.168]) by EU1-MAIL.mgc.mentorg.com with Microsoft SMTPSVC(6.0.3790.1830); Tue, 29 May 2012 20:33:02 +0100 From: Thomas Schwinge To: Tristan Gingold , Tobias Burnus Cc: GCC Patches , Bruce Korb Subject: Re: Fix fixinclude's configure{,.ac} In-Reply-To: <42B42154-52DD-42C8-B401-E34E9665F700@adacore.com> References: <4FBB5A6D.5040509@net-b.de> <42B42154-52DD-42C8-B401-E34E9665F700@adacore.com> User-Agent: Notmuch/0.9-101-g81dad07 (http://notmuchmail.org) Emacs/23.3.1 (x86_64-pc-linux-gnu) Date: Tue, 29 May 2012 21:32:45 +0200 Message-ID: <877gvuaile.fsf@schwinge.name> MIME-Version: 1.0 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Hi! On Tue, 22 May 2012 11:38:55 +0200, Tristan Gingold wrote: > On May 22, 2012, at 11:20 AM, Tobias Burnus wrote: > > an --enable-maintainers-build fails here with: > > > > configure.ac:99: error: possibly undefined macro: gcc_AC_FUNC_MMAP_BLACKLIST > > If this token and others are legitimate, please use m4_pattern_allow. > > See the Autoconf documentation. > > make[3]: *** [fixincludes/configure] Error 1 > > > > Looking at Tristan's commit Rev. 186106 of 2012-04-03, the change gcc_ -> GCC_ is missing. It also looks as if the fixinclude/ config files where not regenerated, even though there was a later patch by Tristan which touches fixinclude's config files (Rev. 186759 of 2012-04-24). I encountered the same issue, and came up with the same fix, . > Indeed, I failed to notice that fixinclude was using ../gcc/config.m4. > > I think it would also make sense to remove '-I ../gcc' from ACLOCAL_AMFLAGS of fixincludes/Makefile.in I agree. > Thank you for having noticed and fixed this bug, > Tristan. > > [ Bruce CC as he is the maintained of fixinclude] Thusly fixed: fixincludes/ * configure.ac: Use GCC_AC_FUNC_MMAP_BLACKLIST instead of gcc_AC_FUNC_MMAP_BLACKLIST. * Makefile.in (ACLOCAL_AMFLAGS): Don't include ../gcc. * aclocal.m4: Regenerate. * configure: Regenerate. Grüße, Thomas diff --git a/fixincludes/Makefile.in b/fixincludes/Makefile.in index b9857b9..92b365c 100644 --- a/fixincludes/Makefile.in +++ b/fixincludes/Makefile.in @@ -66,7 +66,7 @@ mkinstalldirs=$(SHELL) $(srcdir)/../mkinstalldirs AUTOCONF = autoconf AUTOHEADER = autoheader ACLOCAL = aclocal -ACLOCAL_AMFLAGS = -I ../gcc -I .. -I ../config +ACLOCAL_AMFLAGS = -I .. -I ../config default : all diff --git a/fixincludes/aclocal.m4 b/fixincludes/aclocal.m4 index b23541c..7237922 100644 --- a/fixincludes/aclocal.m4 +++ b/fixincludes/aclocal.m4 @@ -12,6 +12,6 @@ # PARTICULAR PURPOSE. m4_include([../config/acx.m4]) +m4_include([../config/mmap.m4]) m4_include([../config/override.m4]) m4_include([../config/warnings.m4]) -m4_include([../gcc/acinclude.m4]) diff --git a/fixincludes/configure b/fixincludes/configure index ea889b8..4836cd8 100755 --- a/fixincludes/configure +++ b/fixincludes/configure @@ -5222,7 +5222,7 @@ else # read() to the same fd. The only system known to have a problem here # is VMS, where text files have record structure. case "$host_os" in - vms* | ultrix*) + *vms* | ultrix*) gcc_cv_func_mmap_file=no ;; *) gcc_cv_func_mmap_file=yes;; @@ -5246,7 +5246,7 @@ else # Systems known to be in this category are Windows (all variants), # VMS, and Darwin. case "$host_os" in - vms* | cygwin* | pe | mingw* | darwin* | ultrix* | hpux10* | hpux11.00) + *vms* | cygwin* | pe | mingw* | darwin* | ultrix* | hpux10* | hpux11.00) gcc_cv_func_mmap_dev_zero=no ;; *) gcc_cv_func_mmap_dev_zero=yes;; @@ -5303,7 +5303,7 @@ else # above for use of /dev/zero. # Systems known to be in this category are Windows, VMS, and SCO Unix. case "$host_os" in - vms* | cygwin* | pe | mingw* | sco* | udk* ) + *vms* | cygwin* | pe | mingw* | sco* | udk* ) gcc_cv_func_mmap_anon=no ;; *) gcc_cv_func_mmap_anon=yes;; diff --git a/fixincludes/configure.ac b/fixincludes/configure.ac index f1fb2ff..f8f352f 100644 --- a/fixincludes/configure.ac +++ b/fixincludes/configure.ac @@ -96,7 +96,7 @@ AC_CHECK_DECLS(m4_split(m4_normalize(fixincludes_UNLOCKED_FUNCS))) AC_C_CONST # Checks for library functions. -gcc_AC_FUNC_MMAP_BLACKLIST +GCC_AC_FUNC_MMAP_BLACKLIST AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) AC_ARG_ENABLE(maintainer-mode,