MatCat.OpenSource/8sa1-binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

config/debuginfod: do not include pkg.m4 directly

Browse Source 
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
This commit is contained in:
Mike Frysinger 2021-02-06 19:24:29 -05:00
parent ceda7cf7f7
commit adeab0c5b3
6 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
binutils/ChangeLog
View File

@ -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

1
binutils/aclocal.m4 vendored
View File

@ -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])

5
config/ChangeLog
View File

@ -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.

2
config/debuginfod.m4
View File

@ -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

4
gdb/ChangeLog
View File

@ -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

1
gdb/aclocal.m4 vendored
View File

@ -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])