* [PATCH] config/debuginfod: do not include pkg.m4 directly
@ 2021-02-07 0:31 Mike Frysinger
2021-02-08 19:39 ` Tom Tromey
0 siblings, 1 reply; 3+ messages in thread
From: Mike Frysinger @ 2021-02-07 0:31 UTC (permalink / raw)
To: gdb-patches, binutils
Any code using AC_DEBUGINFOD from this dir is using -I../config when
running aclocal, so an explicit include on pkg.m4 is unnecessary:
aclocal will find the pkg.m4 in this dir just as easily. This is
seen in the only two dirs that use AC_DEBUGINFOD (binutils & gdb)
as their aclocal.m4 already has m4_include on config m4 files.
The include as written only works if aclocal is run on a dir that is
at the same level of config/. Any other depth will fail.
./
|-- config/
|-- binutils/ # works
|-- gdb/ # works
`-- sim/ # works
`-- <port>/ # fails
It fails even if AC_DEBUGINFOD itself isn't used:
sim/bfin/ $ aclocal -I../../config
aclocal-1.15: error: ../../config/debuginfod.m4:8: file '../config/pkg.m4' does not exist
config/
* debuginfod.m4: Delete m4_include(../config/pkg.m4).
binutils/
* aclocal.m4: Regenerate.
gdb/
* aclocal.m4: Regenerate.
---
binutils/aclocal.m4 | 1 +
config/debuginfod.m4 | 2 --
gdb/aclocal.m4 | 1 +
3 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/binutils/aclocal.m4 b/binutils/aclocal.m4
index 8eca8cf94c73..e6b490ac4c6c 100644
--- a/binutils/aclocal.m4
+++ b/binutils/aclocal.m4
@@ -1201,6 +1201,7 @@ m4_include([../config/lib-link.m4])
m4_include([../config/lib-prefix.m4])
m4_include([../config/nls.m4])
m4_include([../config/override.m4])
+m4_include([../config/pkg.m4])
m4_include([../config/plugins.m4])
m4_include([../config/po.m4])
m4_include([../config/progtest.m4])
diff --git a/config/debuginfod.m4 b/config/debuginfod.m4
index f9eb0988e354..2c1bfbdb544b 100644
--- a/config/debuginfod.m4
+++ b/config/debuginfod.m4
@@ -5,8 +5,6 @@ dnl Public License, this file may be distributed as part of a program
dnl that contains a configuration script generated by Autoconf, under
dnl the same distribution terms as the rest of that program.
-m4_include([../config/pkg.m4])
-
AC_DEFUN([AC_DEBUGINFOD],
[
# Handle optional debuginfod support
diff --git a/gdb/aclocal.m4 b/gdb/aclocal.m4
index 110b416e6156..cbea739c0e51 100644
--- a/gdb/aclocal.m4
+++ b/gdb/aclocal.m4
@@ -199,4 +199,5 @@ AC_DEFUN([_AM_SUBST_NOTMAKE])
# Public sister of _AM_SUBST_NOTMAKE.
AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
+m4_include([../config/pkg.m4])
m4_include([acinclude.m4])
--
2.30.0
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] config/debuginfod: do not include pkg.m4 directly
2021-02-07 0:31 [PATCH] config/debuginfod: do not include pkg.m4 directly Mike Frysinger
@ 2021-02-08 19:39 ` Tom Tromey
2021-02-13 5:17 ` Mike Frysinger
0 siblings, 1 reply; 3+ messages in thread
From: Tom Tromey @ 2021-02-08 19:39 UTC (permalink / raw)
To: Mike Frysinger via Binutils; +Cc: gdb-patches, Mike Frysinger
>>>>> "Mike" == Mike Frysinger via Binutils <binutils@sourceware.org> writes:
Mike> Any code using AC_DEBUGINFOD from this dir is using -I../config when
Mike> running aclocal, so an explicit include on pkg.m4 is unnecessary:
Mike> aclocal will find the pkg.m4 in this dir just as easily. This is
Mike> seen in the only two dirs that use AC_DEBUGINFOD (binutils & gdb)
Mike> as their aclocal.m4 already has m4_include on config m4 files.
Mike> The include as written only works if aclocal is run on a dir that is
Mike> config/
Mike> * debuginfod.m4: Delete m4_include(../config/pkg.m4).
Mike> binutils/
Mike> * aclocal.m4: Regenerate.
Mike> gdb/
Mike> * aclocal.m4: Regenerate.
This is fine by me, but please wait a little while in case someone on
the binutils list has a differing opinion.
thanks,
Tom
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] config/debuginfod: do not include pkg.m4 directly
2021-02-08 19:39 ` Tom Tromey
@ 2021-02-13 5:17 ` Mike Frysinger
0 siblings, 0 replies; 3+ messages in thread
From: Mike Frysinger @ 2021-02-13 5:17 UTC (permalink / raw)
To: Tom Tromey; +Cc: binutils, gdb-patches
On 08 Feb 2021 12:39, Tom Tromey wrote:
> >>>>> "Mike" == Mike Frysinger via Binutils <binutils@sourceware.org> writes:
>
> Mike> Any code using AC_DEBUGINFOD from this dir is using -I../config when
> Mike> running aclocal, so an explicit include on pkg.m4 is unnecessary:
> Mike> aclocal will find the pkg.m4 in this dir just as easily. This is
> Mike> seen in the only two dirs that use AC_DEBUGINFOD (binutils & gdb)
> Mike> as their aclocal.m4 already has m4_include on config m4 files.
>
> Mike> The include as written only works if aclocal is run on a dir that is
>
> Mike> config/
> Mike> * debuginfod.m4: Delete m4_include(../config/pkg.m4).
>
> Mike> binutils/
> Mike> * aclocal.m4: Regenerate.
>
> Mike> gdb/
> Mike> * aclocal.m4: Regenerate.
>
> This is fine by me, but please wait a little while in case someone on
> the binutils list has a differing opinion.
thanks, i've pushed now
-mike
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-02-13 5:17 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-07 0:31 [PATCH] config/debuginfod: do not include pkg.m4 directly Mike Frysinger
2021-02-08 19:39 ` Tom Tromey
2021-02-13 5:17 ` Mike Frysinger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).