From: Sergio Durigan Junior <sergiodj@redhat.com>
To: Simon Marchi <simon.marchi@polymtl.ca>
Cc: GDB Patches <gdb-patches@sourceware.org>,
Pedro Alves <palves@redhat.com>, Tom Tromey <tom@tromey.com>
Subject: Re: [PATCH] Update gnulib/Makefile.in:aclocal_m4_deps
Date: Thu, 30 Aug 2018 20:00:00 -0000 [thread overview]
Message-ID: <87bm9jiq05.fsf@redhat.com> (raw)
In-Reply-To: <72e6edf3ddf2c9994c5e5d3ebfbfb171@polymtl.ca> (Simon Marchi's message of "Thu, 30 Aug 2018 13:04:57 -0400")
On Thursday, August 30 2018, Simon Marchi wrote:
> On 2018-08-30 11:57, Sergio Durigan Junior wrote:
>> It was pointed by Pedro that gnulib/Makefile.in should be updated
>> accordingly after our local gnulib is also updated. The specific part
>> that needs to be refreshed is the "aclocal_m4_deps" variable, which
>> lists the .m4 files present under the "gnulib/import/m4/" directory.
>> This patch does that.
>>
>> No regressions introduced.
>>
>> gdb/ChangeLog:
>> 2018-08-30 Sergio Durigan Junior <sergiodj@redhat.com>
>>
>> * gnulib/Makefile.in (aclocal_m4_deps): Update according to
>> the files present in "gnulib/import/m4/".
>> ---
>> gdb/ChangeLog | 5 ++
>> gdb/gnulib/Makefile.in | 155 ++++++++++++++++++++++++++++++++---------
>> 2 files changed, 128 insertions(+), 32 deletions(-)
>>
>> diff --git a/gdb/ChangeLog b/gdb/ChangeLog
>> index 0d55fd45f5..2ecc4173e8 100644
>> --- a/gdb/ChangeLog
>> +++ b/gdb/ChangeLog
>> @@ -1,3 +1,8 @@
>> +2018-08-30 Sergio Durigan Junior <sergiodj@redhat.com>
>> +
>> + * gnulib/Makefile.in (aclocal_m4_deps): Update according to
>> + the files present in "gnulib/import/m4/".
>> +
>> 2018-08-30 Andrew Burgess <andrew.burgess@embecosm.com>
>>
>> * riscv-tdep.c (riscv_insn::decode): Decode c.addi4spn, c.sd,
>> diff --git a/gdb/gnulib/Makefile.in b/gdb/gnulib/Makefile.in
>> index 191ecbda02..1602da54b6 100644
>> --- a/gdb/gnulib/Makefile.in
>> +++ b/gdb/gnulib/Makefile.in
>> @@ -207,49 +207,140 @@ ACLOCAL = aclocal
>> ACLOCAL_AMFLAGS = -I import/m4 -I ../../config
>> aclocal_m4_deps = \
>> configure.ac \
>> - import/m4/00gnulib.m4 \
>> - import/m4/alloca.m4 \
>> - import/m4/codeset.m4 \
>> - import/m4/configmake.m4 \
>> - import/m4/extensions.m4 \
>> - import/m4/fcntl-o.m4 \
>> - import/m4/fnmatch.m4 \
>> - import/m4/glibc21.m4 \
>> - import/m4/gnulib-cache.m4 \
>> + import/m4/flexmember.m4 \
>> + import/m4/eealloc.m4 \
>> + import/m4/mkdir.m4 \
>> + import/m4/close.m4 \
>> + import/m4/unistd-safer.m4 \
>> + import/m4/inttypes-pri.m4 \
>> + import/m4/chdir-long.m4 \
>> import/m4/gnulib-common.m4 \
>> - import/m4/gnulib-comp.m4 \
>> + import/m4/readdir.m4 \
>> + import/m4/stdlib_h.m4 \
>> + import/m4/getlogin_r.m4 \
>> + import/m4/warn-on-use.m4 \
>> + import/m4/getdtablesize.m4 \
>> + import/m4/rewinddir.m4 \
>> + import/m4/string_h.m4 \
>> + import/m4/closedir.m4 \
>> + import/m4/canonicalize.m4 \
>> + import/m4/stdio_h.m4 \
>> + import/m4/fdopendir.m4 \
>> + import/m4/getcwd-abort-bug.m4 \
>> + import/m4/alloca.m4 \
>> + import/m4/strstr.m4 \
>> + import/m4/stat-time.m4 \
>> + import/m4/builtin-expect.m4 \
>> + import/m4/rawmemchr.m4 \
>> + import/m4/msvc-nothrow.m4 \
>> + import/m4/absolute-header.m4 \
>> + import/m4/isnanl.m4 \
>> + import/m4/stddef_h.m4 \
>> import/m4/gnulib-tool.m4 \
>> - import/m4/include_next.m4 \
>> - import/m4/inttypes-pri.m4 \
>> - import/m4/inttypes.m4 \
>> - import/m4/localcharset.m4 \
>> - import/m4/locale-fr.m4 \
>> + import/m4/realloc.m4 \
>> + import/m4/d-type.m4 \
>> + import/m4/frexp.m4 \
>> + import/m4/getcwd-path-max.m4 \
>> + import/m4/dup2.m4 \
>> + import/m4/strtok_r.m4 \
>> + import/m4/exponentd.m4 \
>> + import/m4/std-gnu11.m4 \
>> import/m4/locale-ja.m4 \
>> + import/m4/gettimeofday.m4 \
>> + import/m4/time_h.m4 \
>> + import/m4/malloc.m4 \
>> + import/m4/fnmatch_h.m4 \
>> + import/m4/codeset.m4 \
>> + import/m4/getcwd.m4 \
>> + import/m4/readlink.m4 \
>> import/m4/locale-zh.m4 \
>> - import/m4/longlong.m4 \
>> + import/m4/stdint.m4 \
>> + import/m4/memrchr.m4 \
>> + import/m4/onceonly.m4 \
>> + import/m4/pathmax.m4 \
>> + import/m4/rename.m4 \
>> + import/m4/rmdir.m4 \
>> + import/m4/dup.m4 \
>> + import/m4/errno_h.m4 \
>> import/m4/mbrtowc.m4 \
>> - import/m4/mbsinit.m4 \
>> + import/m4/environ.m4 \
>> + import/m4/wchar_h.m4 \
>> + import/m4/strchrnul.m4 \
>> + import/m4/fcntl_h.m4 \
>> + import/m4/getpagesize.m4 \
>> + import/m4/largefile.m4 \
>> + import/m4/openat.m4 \
>> + import/m4/save-cwd.m4 \
>> + import/m4/stat.m4 \
>> + import/m4/include_next.m4 \
>> + import/m4/mmap-anon.m4 \
>> + import/m4/mode_t.m4 \
>> + import/m4/exponentl.m4 \
>> + import/m4/sys_types_h.m4 \
>> + import/m4/fcntl-o.m4 \
>> + import/m4/stdbool.m4 \
>> + import/m4/float_h.m4 \
>> + import/m4/msvc-inval.m4 \
>> + import/m4/wctype_h.m4 \
>> + import/m4/gnulib-cache.m4 \
>> import/m4/mbsrtowcs.m4 \
>> - import/m4/mbstate_t.m4 \
>> + import/m4/limits-h.m4 \
>> + import/m4/locale-fr.m4 \
>> + import/m4/fstatat.m4 \
>> + import/m4/inttypes.m4 \
>> import/m4/memchr.m4 \
>> - import/m4/memmem.m4 \
>> - import/m4/mmap-anon.m4 \
>> - import/m4/multiarch.m4 \
>> + import/m4/glob.m4 \
>> + import/m4/fstat.m4 \
>> + import/m4/sys_stat_h.m4 \
>> import/m4/off_t.m4 \
>> - import/m4/pathmax.m4 \
>> + import/m4/strdup.m4 \
>> import/m4/ssize_t.m4 \
>> - import/m4/stdbool.m4 \
>> - import/m4/stddef_h.m4 \
>> - import/m4/stdint.m4 \
>> - import/m4/string_h.m4 \
>> - import/m4/strtok_r.m4 \
>> - import/m4/sys_types_h.m4 \
>> + import/m4/math_h.m4 \
>> import/m4/unistd_h.m4 \
>> - import/m4/warn-on-use.m4 \
>> - import/m4/wchar_h.m4 \
>> + import/m4/fpieee.m4 \
>> + import/m4/mempcpy.m4 \
>> + import/m4/wint_t.m4 \
>> + import/m4/d-ino.m4 \
>> + import/m4/setenv.m4 \
>> + import/m4/open-cloexec.m4 \
>> + import/m4/longlong.m4 \
>> + import/m4/multiarch.m4 \
>> + import/m4/filenamecat.m4 \
>> + import/m4/gnulib-comp.m4 \
>> + import/m4/mkstemp.m4 \
>> + import/m4/dirfd.m4 \
>> + import/m4/getlogin.m4 \
>> + import/m4/signal_h.m4 \
>> + import/m4/sys_socket_h.m4 \
>> + import/m4/dirname.m4 \
>> + import/m4/00gnulib.m4 \
>> + import/m4/dirent_h.m4 \
>> + import/m4/opendir.m4 \
>> + import/m4/error.m4 \
>> + import/m4/extensions.m4 \
>> + import/m4/fchdir.m4 \
>> + import/m4/mbsinit.m4 \
>> + import/m4/__inline.m4 \
>> + import/m4/extern-inline.m4 \
>> + import/m4/fnmatch.m4 \
>> + import/m4/lstat.m4 \
>> + import/m4/nocrash.m4 \
>> + import/m4/sys_time_h.m4 \
>> + import/m4/localcharset.m4 \
>> + import/m4/open.m4 \
>> + import/m4/localtime-buffer.m4 \
>> + import/m4/getprogname.m4 \
>> import/m4/wchar_t.m4 \
>> - import/m4/wctype_h.m4 \
>> - import/m4/wint_t.m4
>> + import/m4/isnand.m4 \
>> + import/m4/double-slash-root.m4 \
>> + import/m4/malloca.m4 \
>> + import/m4/fcntl.m4 \
>> + import/m4/frexpl.m4 \
>> + import/m4/strerror.m4 \
>> + import/m4/glob_h.m4 \
>> + import/m4/tempname.m4 \
>> + import/m4/memmem.m4 \
>> + import/m4/mbstate_t.m4
>>
>> $(srcdir)/aclocal.m4: @MAINTAINER_MODE_TRUE@ $(aclocal_m4_deps)
>> cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
>
> This looks good to me, the set of m4 files listed here matches the
> list of actual m4 files in import/m4. Follow-up question, could we
> use $(wildcard ...) instead of listing them by hand?
Yeah, I think that could work. That's basically what I did to generate
this list: "ls *.m4". If you want, I can edit the patch and make it use
$(wildcard) before pushing it.
--
Sergio
GPG key ID: 237A 54B1 0287 28BF 00EF 31F4 D0EB 7628 65FC 5E36
Please send encrypted e-mail if possible
http://sergiodj.net/
next prev parent reply other threads:[~2018-08-30 20:00 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-28 19:59 [PATCH] Update gnulib to current upstream master Sergio Durigan Junior
2018-08-29 16:19 ` Tom Tromey
2018-08-29 16:29 ` Sergio Durigan Junior
2018-08-29 19:06 ` Pedro Alves
2018-08-29 19:34 ` Sergio Durigan Junior
2018-08-31 13:04 ` Pedro Alves
2018-08-30 0:04 ` Tom Tromey
2018-08-30 3:01 ` Sergio Durigan Junior
2018-08-30 15:57 ` [PATCH] Update gnulib/Makefile.in:aclocal_m4_deps Sergio Durigan Junior
2018-08-30 17:05 ` Simon Marchi
2018-08-30 20:00 ` Sergio Durigan Junior [this message]
2018-08-31 7:59 ` Joel Brobecker
2018-08-31 16:02 ` Sergio Durigan Junior
2018-08-31 11:21 ` Pedro Alves
2018-08-31 16:03 ` Sergio Durigan Junior
2018-09-02 21:21 ` [PATCH] Automatically update "aclocal_m4_deps" when updating gnulib Sergio Durigan Junior
2018-09-03 11:15 ` Pedro Alves
2018-09-03 21:18 ` Sergio Durigan Junior
2018-09-04 11:10 ` Pedro Alves
2018-09-04 17:58 ` Sergio Durigan Junior
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87bm9jiq05.fsf@redhat.com \
--to=sergiodj@redhat.com \
--cc=gdb-patches@sourceware.org \
--cc=palves@redhat.com \
--cc=simon.marchi@polymtl.ca \
--cc=tom@tromey.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).