From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id 7C8D3385743B for ; Thu, 17 Jun 2021 04:21:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 7C8D3385743B Received: from vapier (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 58278335D71; Thu, 17 Jun 2021 04:21:52 +0000 (UTC) Date: Thu, 17 Jun 2021 00:21:51 -0400 From: Mike Frysinger To: Simon Marchi Cc: gdb-patches@sourceware.org Subject: Re: [PATCH] gdb/gdbserver: switch to AC_CONFIG_MACRO_DIRS Message-ID: Mail-Followup-To: Simon Marchi , gdb-patches@sourceware.org References: <20210615054416.1232-1-vapier@gentoo.org> <33565c24-0468-1ded-63db-d7ef402d5329@polymtl.ca> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <33565c24-0468-1ded-63db-d7ef402d5329@polymtl.ca> X-Spam-Status: No, score=-10.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, KAM_SHORT, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org 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: , X-List-Received-Date: Thu, 17 Jun 2021 04:22:00 -0000 On 16 Jun 2021 22:30, Simon Marchi wrote: > On 2021-06-15 1:44 a.m., Mike Frysinger via Gdb-patches wrote: > > These dirs don't use automake, so use AC_CONFIG_MACRO_DIRS to specify > > ../config as a search dir for m4 macros. This allows removal of a lot > > of hand-written m4_include's from acinclude.m4 files, and simplifies > > use of `aclocal` or `autoreconf` as manual -I is not needed. > > For some reason, I get this when reconfiguring gdb: > > configure.ac:531: warning: macro 'AM_ICONV' not found in library > > The result looks ok, the resulting configure looks fine, but if you > happen to know why... i don't know why automake is able to find some of the ../config/ m4 files just fine, but a few others it barfs on. i don't see the warning because i have gettext installed and automake finds the system iconv.m4. restoring the explicit include in the gdb file should fix it. -mike >From 971050c6ba9f839ec9ec02d1fb21ca1a6dbef73c Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Tue, 15 Jun 2021 01:40:33 -0400 Subject: [PATCH] gdb/gdbserver: switch to AC_CONFIG_MACRO_DIRS These dirs don't use automake, so use AC_CONFIG_MACRO_DIRS to specify ../config as a search dir for m4 macros. This allows removal of a lot of hand-written m4_include's from acinclude.m4 files, and simplifies use of `aclocal` or `autoreconf` as manual -I is not needed. --- gdb/ChangeLog | 7 +++++++ gdb/acinclude.m4 | 37 ------------------------------------- gdb/aclocal.m4 | 14 ++++++++++++++ gdb/configure | 1 + gdb/configure.ac | 3 +-- gdbserver/ChangeLog | 7 +++++++ gdbserver/acinclude.m4 | 19 ------------------- gdbserver/aclocal.m4 | 9 +++++++++ gdbserver/configure | 1 + gdbserver/configure.ac | 1 + 10 files changed, 41 insertions(+), 58 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 2444773bde93..58311e6a4e70 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2021-06-15 Mike Frysinger + + * acinclude.m4: Delete most m4_include's of ../config files. + * configure.ac: Delete m4_include call and call AC_CONFIG_MACRO_DIR. + * aclocal.m4: Regenerate. + * configure: Regenerate. + 2021-06-16 Simon Marchi * silent-rules.mk (ECHO_CCLD, ECHO_AR, ECHO_RANLIB): New. diff --git a/gdb/acinclude.m4 b/gdb/acinclude.m4 index 68520d6d9381..0fbef22bb0f4 100644 --- a/gdb/acinclude.m4 +++ b/gdb/acinclude.m4 @@ -21,41 +21,6 @@ m4_include(../gdbsupport/selftest.m4) dnl gdb/configure.in uses BFD_NEED_DECLARATION, so get its definition. m4_include(../bfd/bfd.m4) -dnl This gets the standard macros. -m4_include(../config/acinclude.m4) - -dnl This gets GCC_ENABLE. -sinclude(../config/enable.m4) - -dnl This gets AC_PLUGINS, needed by ACX_LARGEFILE. -m4_include(../config/plugins.m4) - -dnl For ACX_LARGEFILE. -m4_include(../config/largefile.m4) - -dnl For AM_SET_LEADING_DOT. -m4_include(../config/lead-dot.m4) - -dnl This gets autoconf bugfixes. -m4_include(../config/override.m4) - -dnl For ZW_GNU_GETTEXT_SISTER_DIR. -m4_include(../config/gettext-sister.m4) - -dnl For AC_LIB_HAVE_LINKFLAGS. -m4_include(../config/lib-ld.m4) -m4_include(../config/lib-prefix.m4) -m4_include(../config/lib-link.m4) - -dnl For ACX_PKGVERSION and ACX_BUGURL. -m4_include(../config/acx.m4) - -dnl for TCL definitions -m4_include(../config/tcl.m4) - -dnl For dependency tracking macros. -m4_include([../config/depstand.m4]) - dnl For AM_LC_MESSAGES m4_include([../config/lcmessage.m4]) @@ -76,8 +41,6 @@ m4_include(../gdbsupport/ptrace.m4) m4_include(ax_cxx_compile_stdcxx.m4) -m4_include([../config/ax_pthread.m4]) - dnl written by Guido Draheim , original by Alexandre Oliva dnl Version 1.3 (2001/03/02) dnl source http://www.gnu.org/software/ac-archive/Miscellaneous/ac_define_dir.html diff --git a/gdb/aclocal.m4 b/gdb/aclocal.m4 index cbea739c0e51..3869777d20c4 100644 --- a/gdb/aclocal.m4 +++ b/gdb/aclocal.m4 @@ -199,5 +199,19 @@ AC_DEFUN([_AM_SUBST_NOTMAKE]) # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) +m4_include([../config/acx.m4]) +m4_include([../config/ax_pthread.m4]) +m4_include([../config/debuginfod.m4]) +m4_include([../config/depstand.m4]) +m4_include([../config/enable.m4]) +m4_include([../config/gettext-sister.m4]) +m4_include([../config/largefile.m4]) +m4_include([../config/lead-dot.m4]) +m4_include([../config/lib-ld.m4]) +m4_include([../config/lib-link.m4]) +m4_include([../config/lib-prefix.m4]) +m4_include([../config/override.m4]) m4_include([../config/pkg.m4]) +m4_include([../config/plugins.m4]) +m4_include([../config/tcl.m4]) m4_include([acinclude.m4]) diff --git a/gdb/configure b/gdb/configure index c6b5906d9e47..a5c6fab118c5 100755 --- a/gdb/configure +++ b/gdb/configure @@ -2997,6 +2997,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + ac_config_headers="$ac_config_headers config.h:config.in" diff --git a/gdb/configure.ac b/gdb/configure.ac index 68cf84d6ca3f..67aa628c47d4 100644 --- a/gdb/configure.ac +++ b/gdb/configure.ac @@ -18,9 +18,8 @@ dnl along with this program. If not, see . dnl Process this file with autoconf to produce a configure script. -m4_include(../config/debuginfod.m4) - AC_INIT +AC_CONFIG_MACRO_DIRS([../config]) AC_CONFIG_SRCDIR([main.c]) AC_CONFIG_HEADERS(config.h:config.in, [echo > stamp-h]) AM_MAINTAINER_MODE diff --git a/gdbserver/ChangeLog b/gdbserver/ChangeLog index 9f4fcf81603f..d29e438dcf36 100644 --- a/gdbserver/ChangeLog +++ b/gdbserver/ChangeLog @@ -1,3 +1,10 @@ +2021-06-15 Mike Frysinger + + * acinclude.m4: Delete most m4_include's of ../config files. + * configure.ac: Delete m4_include call and call AC_CONFIG_MACRO_DIR. + * aclocal.m4: Regenerate. + * configure: Regenerate. + 2021-06-14 Mike Frysinger * Makefile.in (GNULIB_BUILDDIR): Rename to ... diff --git a/gdbserver/acinclude.m4 b/gdbserver/acinclude.m4 index e18ee9913a5c..741ac820fd2c 100644 --- a/gdbserver/acinclude.m4 +++ b/gdbserver/acinclude.m4 @@ -4,20 +4,6 @@ m4_include(../bfd/bfd.m4) dnl This gets AM_GDB_WARNINGS. m4_include(../gdbsupport/warning.m4) -dnl This gets autoconf bugfixes -m4_include(../config/override.m4) - -dnl For ACX_PKGVERSION and ACX_BUGURL. -m4_include(../config/acx.m4) - -m4_include(../config/depstand.m4) -m4_include(../config/lead-dot.m4) - -dnl Needed for common.m4 -dnl For AC_LIB_HAVE_LINKFLAGS. -m4_include(../config/lib-ld.m4) -m4_include(../config/lib-prefix.m4) -m4_include(../config/lib-link.m4) dnl codeset.m4 is needed for common.m4, but not for dnl anything else in gdbserver. m4_include(../config/codeset.m4) @@ -34,11 +20,6 @@ m4_include(../gdb/ax_cxx_compile_stdcxx.m4) dnl For GDB_AC_SELFTEST. m4_include(../gdbsupport/selftest.m4) -m4_include([../config/ax_pthread.m4]) - -dnl For ZW_GNU_GETTEXT_SISTER_DIR. -m4_include(../config/gettext-sister.m4) - dnl Check for existence of a type $1 in libthread_db.h dnl Based on BFD_HAVE_SYS_PROCFS_TYPE in bfd/bfd.m4. diff --git a/gdbserver/aclocal.m4 b/gdbserver/aclocal.m4 index 110b416e6156..bceb92fdb5dd 100644 --- a/gdbserver/aclocal.m4 +++ b/gdbserver/aclocal.m4 @@ -199,4 +199,13 @@ AC_DEFUN([_AM_SUBST_NOTMAKE]) # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) +m4_include([../config/acx.m4]) +m4_include([../config/ax_pthread.m4]) +m4_include([../config/depstand.m4]) +m4_include([../config/gettext-sister.m4]) +m4_include([../config/lead-dot.m4]) +m4_include([../config/lib-ld.m4]) +m4_include([../config/lib-link.m4]) +m4_include([../config/lib-prefix.m4]) +m4_include([../config/override.m4]) m4_include([acinclude.m4]) diff --git a/gdbserver/configure b/gdbserver/configure index aab72c0b8c51..b9d4653ae5e1 100755 --- a/gdbserver/configure +++ b/gdbserver/configure @@ -2714,6 +2714,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + ac_config_headers="$ac_config_headers config.h:config.in" diff --git a/gdbserver/configure.ac b/gdbserver/configure.ac index 5ec222dfc605..afac1831ecde 100644 --- a/gdbserver/configure.ac +++ b/gdbserver/configure.ac @@ -19,6 +19,7 @@ dnl along with this program. If not, see . dnl Process this file with autoconf to produce a configure script. AC_INIT +AC_CONFIG_MACRO_DIRS([../config]) AC_CONFIG_SRCDIR([server.cc]) AC_CONFIG_HEADERS(config.h:config.in, [echo > stamp-h]) -- 2.31.1