From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id dA+wHcpLRmBgaAAAWB0awg (envelope-from ) for ; Mon, 08 Mar 2021 11:07:38 -0500 Received: by simark.ca (Postfix, from userid 112) id 68BBB1EF78; Mon, 8 Mar 2021 11:07:38 -0500 (EST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,RDNS_NONE,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from sourceware.org (unknown [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 124051E789 for ; Mon, 8 Mar 2021 11:07:35 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 36C943850419; Mon, 8 Mar 2021 16:07:34 +0000 (GMT) Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) by sourceware.org (Postfix) with ESMTPS id AC7783850419 for ; Mon, 8 Mar 2021 16:07:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org AC7783850419 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=andrew.burgess@embecosm.com Received: by mail-wr1-x429.google.com with SMTP id l12so12030996wry.2 for ; Mon, 08 Mar 2021 08:07:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=nN3CcjTVEWj5IPvXxUYG8EBRngOUFEir2NUxYXW1d0I=; b=R7nY4LrHXtRKGoWb6T9eMy1hP5F1EHAee98DgyKFcPLIEMctzckQYoP26K/GNeMntK iiE/y4yJuRj++46ABCzdiJLFCAmkqxhuy3tI8f1gq1fusPj+BceYITneQdJjVsDwvHm1 3rQJrPa/9TFwJZf0UJmv9VcUi5CT1Txiiaus5s/XzFMBlWU9UymkcizU0sXyFnPBLecS VnsZSKSatcqOyA8ly1vW9b155bJxAnRxRIOLneJRj9HX49YNFSRozhb/RXJHf9ATJHyh IABwlbg1d4RKvlQzctYQLp7y0efY/KwztjMdVP2EA1gisCpqd0nw7Ng5z3zT1HpnMb30 T1Gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=nN3CcjTVEWj5IPvXxUYG8EBRngOUFEir2NUxYXW1d0I=; b=X5YeYaDCAOkUP7YRI1Dr89u2/BlgNLzHNW2GORDZVYb7wxUUoo6pmhTK5ZswReuYDX w6MONUzE/3YtI76yng9s7T0ylJfPQT5rI9+kfG54kIhfVyN+uWXE5lH8P1nfSqXTU+XL yVWWs+GiAldnZog4tpICVpSCuvOoC1/gqPf703ezZEDPZAEyTgigFeWy07HUNnGJgGXC CNHJTtE2L8MJ3aZQTtwwynjRB49QqJxyHQLBKwYxozU3fw+zTcochFhU1/rjPzIFuRBC 4RyqvgV4Fh1zEfXcmMp0uYsb3nIRl1T5crqvLEMBX0se40B0x8NNd2PWqV9cYTbryOok HN3Q== X-Gm-Message-State: AOAM533NbuhtLfAnoGOm0/YJ0Xi2zFZ6em2IQvBl7fj9mHLe0CKRCsVR S4DOd3kXmTCUcDzUnrpcugc4qg== X-Google-Smtp-Source: ABdhPJxYMa3N54Tewar40vdX49rqf9fdMbeWXmohhtISdu3WbJRaw8QBrjK4KloJujfy/AdN1KvE0g== X-Received: by 2002:a5d:4ac4:: with SMTP id y4mr23167114wrs.86.1615219648026; Mon, 08 Mar 2021 08:07:28 -0800 (PST) Received: from localhost (host86-134-238-232.range86-134.btcentralplus.com. [86.134.238.232]) by smtp.gmail.com with ESMTPSA id z7sm19931917wrt.70.2021.03.08.08.07.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Mar 2021 08:07:27 -0800 (PST) Date: Mon, 8 Mar 2021 16:07:26 +0000 From: Andrew Burgess To: Tom Tromey Subject: Re: [PATCH] Enable maintainer mode for sim Message-ID: <20210308160726.GM1720904@embecosm.com> References: <20210308145527.564647-1-tromey@adacore.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210308145527.564647-1-tromey@adacore.com> X-Operating-System: Linux/5.8.13-100.fc31.x86_64 (x86_64) X-Uptime: 16:06:58 up 89 days, 20:51, X-Editor: GNU Emacs [ http://www.gnu.org/software/emacs ] X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: gdb-patches@sourceware.org Errors-To: gdb-patches-bounces@sourceware.org Sender: "Gdb-patches" * Tom Tromey [2021-03-08 07:55:27 -0700]: > The sim's recently switch to using Automake caused a build failure for > me, because I didn't have the correct auto* tools in my path. > However, the rule in the tree is that this is not needed in general. > This patch adds a call to AM_MAINTAINER_MODE, to align the sim with > the way the rest of the tree works here. > > sim/ChangeLog > 2021-03-08 Tom Tromey > > * aclocal.m4, configure, Makefile.in: Rebuild. > * configure.ac: Use AM_MAINTAINER_MODE. Thanks. I just ran into this too. Fix looks sane to me. Andrew > --- > sim/ChangeLog | 5 +++++ > sim/Makefile.in | 7 ++++--- > sim/aclocal.m4 | 46 +++++++++++++++++++++++++++++++++------------- > sim/configure | 37 +++++++++++++++++++++++++++++++++++++ > sim/configure.ac | 1 + > 5 files changed, 80 insertions(+), 16 deletions(-) > > diff --git a/sim/Makefile.in b/sim/Makefile.in > index 390a8575a75..85849f2745c 100644 > --- a/sim/Makefile.in > +++ b/sim/Makefile.in > @@ -224,6 +224,7 @@ LDFLAGS = @LDFLAGS@ > LIBOBJS = @LIBOBJS@ > LIBS = @LIBS@ > LTLIBOBJS = @LTLIBOBJS@ > +MAINT = @MAINT@ > MAKEINFO = @MAKEINFO@ > MKDIR_P = @MKDIR_P@ > OBJEXT = @OBJEXT@ > @@ -308,7 +309,7 @@ all: all-recursive > .SUFFIXES: > am--refresh: Makefile > @: > -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/testsuite/local.mk $(am__configure_deps) > +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/testsuite/local.mk $(am__configure_deps) > @for dep in $?; do \ > case '$(am__configure_deps)' in \ > *$$dep*) \ > @@ -335,9 +336,9 @@ $(srcdir)/testsuite/local.mk $(am__empty): > $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) > $(SHELL) ./config.status --recheck > > -$(top_srcdir)/configure: $(am__configure_deps) > +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) > $(am__cd) $(srcdir) && $(AUTOCONF) > -$(ACLOCAL_M4): $(am__aclocal_m4_deps) > +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) > $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) > $(am__aclocal_m4_deps): > > diff --git a/sim/aclocal.m4 b/sim/aclocal.m4 > index df8ff837794..e01194da383 100644 > --- a/sim/aclocal.m4 > +++ b/sim/aclocal.m4 > @@ -626,24 +626,41 @@ if test x"${install_sh+set}" != xset; then > fi > AC_SUBST([install_sh])]) > > -# Copyright (C) 2003-2017 Free Software Foundation, Inc. > +# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- > +# From Jim Meyering > + > +# Copyright (C) 1996-2017 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. > > -# Check whether the underlying file-system supports filenames > -# with a leading dot. For instance MS-DOS doesn't. > -AC_DEFUN([AM_SET_LEADING_DOT], > -[rm -rf .tst 2>/dev/null > -mkdir .tst 2>/dev/null > -if test -d .tst; then > - am__leading_dot=. > -else > - am__leading_dot=_ > -fi > -rmdir .tst 2>/dev/null > -AC_SUBST([am__leading_dot])]) > +# AM_MAINTAINER_MODE([DEFAULT-MODE]) > +# ---------------------------------- > +# Control maintainer-specific portions of Makefiles. > +# Default is to disable them, unless 'enable' is passed literally. > +# For symmetry, 'disable' may be passed as well. Anyway, the user > +# can override the default with the --enable/--disable switch. > +AC_DEFUN([AM_MAINTAINER_MODE], > +[m4_case(m4_default([$1], [disable]), > + [enable], [m4_define([am_maintainer_other], [disable])], > + [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 enable maintainer-specific portions of Makefiles]) > + dnl maintainer-mode's default is 'disable' unless 'enable' is passed > + AC_ARG_ENABLE([maintainer-mode], > + [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode], > + am_maintainer_other[ make rules and dependencies not useful > + (and sometimes confusing) to the casual installer])], > + [USE_MAINTAINER_MODE=$enableval], > + [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) > + AC_MSG_RESULT([$USE_MAINTAINER_MODE]) > + AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) > + MAINT=$MAINTAINER_MODE_TRUE > + AC_SUBST([MAINT])dnl > +] > +) > > # Check to see how 'make' treats includes. -*- Autoconf -*- > > @@ -1150,3 +1167,6 @@ AC_SUBST([am__tar]) > AC_SUBST([am__untar]) > ]) # _AM_PROG_TAR > > +m4_include([../config/depstand.m4]) > +m4_include([../config/lead-dot.m4]) > +m4_include([../config/override.m4]) > diff --git a/sim/configure b/sim/configure > index 09c2a4793cd..707a1cc6c02 100755 > --- a/sim/configure > +++ b/sim/configure > @@ -640,6 +640,9 @@ am__isrc > INSTALL_DATA > INSTALL_SCRIPT > INSTALL_PROGRAM > +MAINT > +MAINTAINER_MODE_FALSE > +MAINTAINER_MODE_TRUE > target_os > target_vendor > target_cpu > @@ -693,6 +696,7 @@ SHELL' > ac_subst_files='' > ac_user_opts=' > enable_option_checking > +enable_maintainer_mode > enable_silent_rules > enable_dependency_tracking > enable_sim > @@ -1356,6 +1360,9 @@ Optional Features: > --disable-option-checking ignore unrecognized --enable/--with options > --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) > --enable-FEATURE[=ARG] include FEATURE [ARG=yes] > + --enable-maintainer-mode > + enable make rules and dependencies not useful (and > + sometimes confusing) to the casual installer > --enable-silent-rules less verbose build output (undo: "make V=1") > --disable-silent-rules verbose build output (undo: "make V=0") > --enable-dependency-tracking > @@ -1882,6 +1889,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu > > > > + > + > + > ac_aux_dir= > for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do > if test -f "$ac_dir/install-sh"; then > @@ -2023,6 +2033,29 @@ test -n "$target_alias" && > program_prefix=${target_alias}- > > > + > +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 > +$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } > + # Check whether --enable-maintainer-mode was given. > +if test "${enable_maintainer_mode+set}" = set; then : > + enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval > +else > + USE_MAINTAINER_MODE=no > +fi > + > + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 > +$as_echo "$USE_MAINTAINER_MODE" >&6; } > + if test $USE_MAINTAINER_MODE = yes; then > + MAINTAINER_MODE_TRUE= > + MAINTAINER_MODE_FALSE='#' > +else > + MAINTAINER_MODE_TRUE='#' > + MAINTAINER_MODE_FALSE= > +fi > + > + MAINT=$MAINTAINER_MODE_TRUE > + > + > am__api_version='1.15' > > # Find a good install program. We prefer a C program (faster), > @@ -5097,6 +5130,10 @@ LIBOBJS=$ac_libobjs > LTLIBOBJS=$ac_ltlibobjs > > > +if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then > + as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined. > +Usually this means the macro was only invoked conditionally." "$LINENO" 5 > +fi > { $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 > $as_echo_n "checking that generated files are newer than configure... " >&6; } > if test -n "$am_sleep_pid"; then > diff --git a/sim/configure.ac b/sim/configure.ac > index 23478521e94..709bd3ea9dc 100644 > --- a/sim/configure.ac > +++ b/sim/configure.ac > @@ -7,6 +7,7 @@ AC_INIT([sim], [0], > > AC_CANONICAL_SYSTEM > > +AM_MAINTAINER_MODE > AM_INIT_AUTOMAKE > > AC_PROG_CC > -- > 2.26.2 >