diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2021-02-06 19:24:29 -0500 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2021-02-13 00:15:11 -0500 |
| commit | adeab0c5b33fd5f4959fa9a079a5b558f0088ba3 (patch) | |
| tree | f0e1e771e70ec144700d8ff292154234e2b4bb5a | |
| parent | ceda7cf7f715ff62bfd9caeaa3f1b1ef9fdd4ecf (diff) | |
| download | gdb-adeab0c5b33fd5f4959fa9a079a5b558f0088ba3.zip gdb-adeab0c5b33fd5f4959fa9a079a5b558f0088ba3.tar.gz gdb-adeab0c5b33fd5f4959fa9a079a5b558f0088ba3.tar.bz2 | |
config/debuginfod: do not include pkg.m4 directly
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
| -rw-r--r-- | binutils/ChangeLog | 4 | ||||
| -rw-r--r-- | binutils/aclocal.m4 | 1 | ||||
| -rw-r--r-- | config/ChangeLog | 5 | ||||
| -rw-r--r-- | config/debuginfod.m4 | 2 | ||||
| -rw-r--r-- | gdb/ChangeLog | 4 | ||||
| -rw-r--r-- | gdb/aclocal.m4 | 1 |
6 files changed, 14 insertions, 3 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog index a717099..5b16bb2 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,7 @@ +2021-02-13 Mike Frysinger <vapier@gentoo.org> + + * aclocal.m4: Regenerate. + 2021-02-12 Nick Clifton <nickc@redhat.com> * configure.ac (follow-debug-links): Add option to enable or diff --git a/binutils/aclocal.m4 b/binutils/aclocal.m4 index 8eca8cf..e6b490a 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/ChangeLog b/config/ChangeLog index 847fc06..95dcc85 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,7 @@ +2021-02-13 Mike Frysinger <vapier@gentoo.org> + + * debuginfod.m4: Delete m4_include(../config/pkg.m4). + 2021-01-12 H.J. Lu <hongjiu.lu@intel.com> PR binutils/26792 @@ -2293,4 +2297,3 @@ Thu Jan 30 16:17:30 1992 Stu Grossman (grossman at cygnus.com) Tue Dec 10 00:10:55 1991 K. Richard Pixley (rich at rtl.cygnus.com) * ChangeLog: fresh changelog. - diff --git a/config/debuginfod.m4 b/config/debuginfod.m4 index f9eb098..2c1bfbd 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/ChangeLog b/gdb/ChangeLog index e79b953..204bb40 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +2021-02-13 Mike Frysinger <vapier@gentoo.org> + + * aclocal.m4: Regenerate. + 2021-02-12 Tom de Vries <tdevries@suse.de> PR threads/26228 diff --git a/gdb/aclocal.m4 b/gdb/aclocal.m4 index 110b416..cbea739 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]) |