Re: [PATCH 1/2] gdb, gnulib: Regenerate using the maintainer mode

Tsukasa OI via Gdb-patches
2023-01-04T08:57:24Z

On 2023/01/04 11:02, Tsukasa OI wrote:
> From: Tsukasa OI <research_trasio@irq.a4lg.com>
>
> Those files have changed by regenerating using the maintainer mode.
> gdb/aclocal.m4 changed its m4_include ordering and {gdbsupport,gnulib}
> /Makefile.in changed their copyright year.
> ---
> gdb/aclocal.m4 | 10 +++++-----

It seems, gdb/aclocal.m4 diff is caused by inconsistent maintainer mode
environment and only {gdbsupport,gnulib} are affected.

I'll resubmit PATCH v2 (since PATCH 2/2 is already merged, only consists
of updated version of this patch [PATCH 1/2]).

> gdbsupport/Makefile.in | 2 +-
> gnulib/Makefile.in | 2 +-
> 3 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/gdb/aclocal.m4 b/gdb/aclocal.m4
> index 4aac87b52ed5..806c551456f5 100644
> --- a/gdb/aclocal.m4
> +++ b/gdb/aclocal.m4
> @@ -199,6 +199,11 @@ AC_DEFUN([_AM_SUBST_NOTMAKE])
> # Public sister of _AM_SUBST_NOTMAKE.
> AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
>
> +m4_include([../libtool.m4])
> +m4_include([../ltoptions.m4])
> +m4_include([../ltsugar.m4])
> +m4_include([../ltversion.m4])
> +m4_include([../lt~obsolete.m4])
> m4_include([../config/acx.m4])
> m4_include([../config/ax_pthread.m4])
> m4_include([../config/bfd64.m4])
> @@ -212,9 +217,4 @@ m4_include([../config/override.m4])
> m4_include([../config/pkg.m4])
> m4_include([../config/plugins.m4])
> m4_include([../config/tcl.m4])
> -m4_include([../libtool.m4])
> -m4_include([../ltoptions.m4])
> -m4_include([../ltsugar.m4])
> -m4_include([../ltversion.m4])
> -m4_include([../lt~obsolete.m4])
> m4_include([acinclude.m4])
> diff --git a/gdbsupport/Makefile.in b/gdbsupport/Makefile.in
> index 6aadae410316..c4b43c99c3d7 100644
> --- a/gdbsupport/Makefile.in
> +++ b/gdbsupport/Makefile.in
> @@ -15,7 +15,7 @@
> @SET_MAKE@
>
> #
> -# Copyright (C) 2020-2022 Free Software Foundation, Inc.
> +# Copyright (C) 2020-2023 Free Software Foundation, Inc.
> #
> # This file is free software; you can redistribute it and/or modify
> # it under the terms of the GNU General Public License as published by
> diff --git a/gnulib/Makefile.in b/gnulib/Makefile.in
> index 6a2091627d28..8d5bf7f16729 100644
> --- a/gnulib/Makefile.in
> +++ b/gnulib/Makefile.in
> @@ -14,7 +14,7 @@
>
> @SET_MAKE@
>
> -# Copyright (C) 2019-2022 Free Software Foundation, Inc.
> +# Copyright (C) 2019-2023 Free Software Foundation, Inc.
>
> # This file is part of GDB.
>
>
> base-commit: e346efcde0fd60c8b010cfc5b14dc0e725bc9e75