From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id xOJRCHi1mWDzKwAAWB0awg (envelope-from ) for ; Mon, 10 May 2021 18:36:40 -0400 Received: by simark.ca (Postfix, from userid 112) id 0A8351F11C; Mon, 10 May 2021 18:36:40 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,RDNS_DYNAMIC,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (ip-8-43-85-97.sourceware.org [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 D7E061E813 for ; Mon, 10 May 2021 18:36:35 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 70F213857C61; Mon, 10 May 2021 22:36:35 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 70F213857C61 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1620686195; bh=ngzJvC9qM6SmMQ0G8cpLcWbkFEt4d600/Fx368wA9Wk=; h=Date:To:Subject:References:In-Reply-To:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=WbD5lvjC7FU2ohPxOwH4u9FbWpa7XM4LYr0q+l8LKZVQK3eA7to+UeWmFfJLWXL5n thmCkCiaiNSrB0Mx7ooB10TPg8IEW4/bBo6VX5UC4/wYASQIxoFfXKSYOAGLfyY+dR e98ukH2WpwaCrHZfLJGNv5eQfeI6sPl0Ba0hh+/A= Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by sourceware.org (Postfix) with ESMTP id 42E633857C61 for ; Mon, 10 May 2021 22:36:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 42E633857C61 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 017CF340EF3; Mon, 10 May 2021 22:36:28 +0000 (UTC) Date: Mon, 10 May 2021 18:36:28 -0400 To: Simon Marchi Subject: Re: [PATCH] gdb: add ../config/pkg.m4 in acinclude.m4 Message-ID: Mail-Followup-To: Simon Marchi , gdb-patches@sourceware.org References: <20210509012432.1154603-1-simon.marchi@polymtl.ca> <04311a21-f880-b6d5-eb5d-5cd70d95b607@polymtl.ca> <7955e847-2307-48ad-d436-adf3280db586@polymtl.ca> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <7955e847-2307-48ad-d436-adf3280db586@polymtl.ca> 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: , From: Mike Frysinger via Gdb-patches Reply-To: Mike Frysinger Cc: gdb-patches@sourceware.org Errors-To: gdb-patches-bounces@sourceware.org Sender: "Gdb-patches" On 09 May 2021 21:32, Simon Marchi via Gdb-patches wrote: > Also, the same should be applied to gdbsupport and gdbserver. hmm, not sure about gdbsupport. it's using automake and has: Makefile.am:ACLOCAL_AMFLAGS = -I . -I ../config here's the gdbserver changes after `aclocal && autoconf`: --- a/gdb/acinclude.m4 +++ b/gdb/acinclude.m4 @@ -21,49 +21,12 @@ 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]) dnl For AM_LANGINFO_CODESET. m4_include([../config/codeset.m4]) -m4_include([../config/iconv.m4]) - m4_include([../config/zlib.m4]) m4_include([../gdbsupport/common.m4]) @@ -76,8 +39,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 --- a/gdb/aclocal.m4 +++ b/gdb/aclocal.m4 @@ -199,5 +199,20 @@ 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/iconv.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]) --- a/gdb/configure +++ b/gdb/configure @@ -2990,6 +2990,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + ac_config_headers="$ac_config_headers config.h:config.in" --- 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 --- 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. --- 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]) --- 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" --- 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])