From patchwork Thu Jan 6 19:12:56 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ralf Wildenhues X-Patchwork-Id: 77791 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 E4483B70D4 for ; Fri, 7 Jan 2011 06:13:13 +1100 (EST) Received: (qmail 28704 invoked by alias); 6 Jan 2011 19:13:10 -0000 Received: (qmail 28685 invoked by uid 22791); 6 Jan 2011 19:13:08 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, TW_IB X-Spam-Check-By: sourceware.org Received: from mailout-de.gmx.net (HELO mail.gmx.net) (213.165.64.23) by sourceware.org (qpsmtpd/0.43rc1) with SMTP; Thu, 06 Jan 2011 19:13:03 +0000 Received: (qmail invoked by alias); 06 Jan 2011 19:12:58 -0000 Received: from xdsl-89-0-148-107.netcologne.de (EHLO localhost.localdomain) [89.0.148.107] by mail.gmx.net (mp027) with SMTP; 06 Jan 2011 20:12:58 +0100 Received: from ralf by localhost.localdomain with local (Exim 4.69) (envelope-from ) id 1PavGa-00060t-Ei; Thu, 06 Jan 2011 20:12:56 +0100 Date: Thu, 6 Jan 2011 20:12:56 +0100 From: Ralf Wildenhues To: Eric Botcazou Cc: gcc-patches@gcc.gnu.org, Tobias Burnus , "Joseph S. Myers" , gfortran Subject: Fix PR fortran/47174 (was: [Patch, quadmath] PR 46543: Add first documentation) Message-ID: <20110106191256.GB17791@gmx.de> Mail-Followup-To: Ralf Wildenhues , Eric Botcazou , gcc-patches@gcc.gnu.org, Tobias Burnus , "Joseph S. Myers" , gfortran References: <4CF55592.9050004@net-b.de> <201101022200.25420.ebotcazou@adacore.com> <20110103220853.GA4891@gmx.de> <201101040039.33634.ebotcazou@adacore.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <201101040039.33634.ebotcazou@adacore.com> User-Agent: Mutt/1.5.20 (2010-08-04) X-IsSubscribed: yes 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 * Eric Botcazou wrote on Tue, Jan 04, 2011 at 12:39:33AM CET: > > In what way is that different from, say, libgomp? > > IIUC makeinfo is required for the development tree. > > libgomp doesn't fail to build in this configuration. In fact, all components > used to build in this configuration (except maybe libjava) up to the patch. Ah, got it now. libquadmath is different in that it overrides the libquadmath.info target only conditionally. That lets automake think that its own rule might sometimes still apply, so it outputs the rule for that conditional case. Can you please confirm that the patch below fixes things for you? You need to run automake in libquadmath after applying it. Thanks, Ralf Fix PR fortran/47174 libquadmath/ChangeLog: 2011-01-06 Ralf Wildenhues PR fortran/47174 * Makefile.am (libquadmath.info): Unconditionally override target, not only if BUILD_LIBQUADMATH. * Makefile.in: Regenerate. * configure.ac (AM_INIT_AUTOMAKE): Add -Wno-override option to avoid warning from automake. diff --git a/libquadmath/Makefile.am b/libquadmath/Makefile.am index e907123..83eb749 100644 --- a/libquadmath/Makefile.am +++ b/libquadmath/Makefile.am @@ -126,8 +126,6 @@ stamp-geninsrc: libquadmath.info cp -p $(top_builddir)/libquadmath.info $(srcdir)/libquadmath.info @touch $@ -libquadmath.info: $(STAMP_BUILD_INFO) - stamp-build-info: libquadmath.texi $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) -o libquadmath.info $(srcdir)/libquadmath.texi @touch $@ @@ -135,7 +133,11 @@ stamp-build-info: libquadmath.texi CLEANFILES = $(STAMP_GENINSRC) $(STAMP_BUILD_INFO) libquadmath.info MAINTAINERCLEANFILES = $(srcdir)/libquadmath.info -endif +endif BUILD_LIBQUADMATH + +# Unconditionally override this target, so that automake's definition +# does not wrongly interfere. +libquadmath.info: $(STAMP_BUILD_INFO) # Automake Documentation: diff --git a/libquadmath/configure.ac b/libquadmath/configure.ac index 68b5cf8..568b36a 100644 --- a/libquadmath/configure.ac +++ b/libquadmath/configure.ac @@ -26,7 +26,7 @@ ACX_NONCANONICAL_TARGET target_alias=${target_alias-$host_alias} AC_SUBST(target_alias) -AM_INIT_AUTOMAKE([1.9.0 foreign subdir-objects no-dist -Wall -Werror]) +AM_INIT_AUTOMAKE([1.9.0 foreign subdir-objects no-dist -Wall -Wno-override -Werror]) AC_MSG_CHECKING([for --enable-version-specific-runtime-libs]) AC_ARG_ENABLE(version-specific-runtime-libs,