From: Sam James <sam@gentoo.org>
To: binutils@sourceware.org, gdb-patches@sourceware.org
Cc: Sam James <sam@gentoo.org>
Subject: [COMMITTED] Finalized intl-update patches (trois)
Date: Wed, 15 Nov 2023 15:18:05 +0000 [thread overview]
Message-ID: <20231115151806.2556428-1-sam@gentoo.org> (raw)
Doing this on behalf of Arsen as obvious. Hopefully the last fixup.
* gdb: Regenerate.
* gnulib: Regenerate.
---
gdb/aclocal.m4 | 10 +++++-----
gnulib/Makefile.in | 16 ++++++++--------
gnulib/aclocal.m4 | 12 ++++++------
gnulib/configure | 2 +-
gnulib/import/Makefile.in | 16 ++++++++--------
5 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/gdb/aclocal.m4 b/gdb/aclocal.m4
index 99714239668..05b492625df 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])
@@ -217,9 +222,4 @@ m4_include([../config/plugins.m4])
m4_include([../config/po.m4])
m4_include([../config/progtest.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/gnulib/Makefile.in b/gnulib/Makefile.in
index 8d5bf7f1672..02886fe877a 100644
--- a/gnulib/Makefile.in
+++ b/gnulib/Makefile.in
@@ -107,12 +107,7 @@ host_triplet = @host@
target_triplet = @target@
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \
- $(top_srcdir)/../config/largefile.m4 \
- $(top_srcdir)/../config/lead-dot.m4 \
- $(top_srcdir)/../config/override.m4 \
- $(top_srcdir)/../config/plugins.m4 \
- $(top_srcdir)/import/m4/00gnulib.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/import/m4/00gnulib.m4 \
$(top_srcdir)/import/m4/__inline.m4 \
$(top_srcdir)/import/m4/absolute-header.m4 \
$(top_srcdir)/import/m4/alloca.m4 \
@@ -125,7 +120,6 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \
$(top_srcdir)/import/m4/clock_time.m4 \
$(top_srcdir)/import/m4/close.m4 \
$(top_srcdir)/import/m4/closedir.m4 \
- $(top_srcdir)/import/m4/codeset.m4 \
$(top_srcdir)/import/m4/ctype_h.m4 \
$(top_srcdir)/import/m4/d-ino.m4 \
$(top_srcdir)/import/m4/d-type.m4 \
@@ -282,7 +276,13 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \
$(top_srcdir)/import/m4/wmemchr.m4 \
$(top_srcdir)/import/m4/wmempcpy.m4 \
$(top_srcdir)/import/m4/year2038.m4 \
- $(top_srcdir)/import/m4/zzgnulib.m4 $(top_srcdir)/configure.ac
+ $(top_srcdir)/import/m4/zzgnulib.m4 \
+ $(top_srcdir)/../config/codeset.m4 \
+ $(top_srcdir)/../config/depstand.m4 \
+ $(top_srcdir)/../config/largefile.m4 \
+ $(top_srcdir)/../config/lead-dot.m4 \
+ $(top_srcdir)/../config/override.m4 \
+ $(top_srcdir)/../config/plugins.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
diff --git a/gnulib/aclocal.m4 b/gnulib/aclocal.m4
index 707108d7abf..c7f866eb8bf 100644
--- a/gnulib/aclocal.m4
+++ b/gnulib/aclocal.m4
@@ -1169,11 +1169,6 @@ AC_SUBST([am__tar])
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
-m4_include([../config/depstand.m4])
-m4_include([../config/largefile.m4])
-m4_include([../config/lead-dot.m4])
-m4_include([../config/override.m4])
-m4_include([../config/plugins.m4])
m4_include([import/m4/00gnulib.m4])
m4_include([import/m4/__inline.m4])
m4_include([import/m4/absolute-header.m4])
@@ -1187,7 +1182,6 @@ m4_include([import/m4/chown.m4])
m4_include([import/m4/clock_time.m4])
m4_include([import/m4/close.m4])
m4_include([import/m4/closedir.m4])
-m4_include([import/m4/codeset.m4])
m4_include([import/m4/ctype_h.m4])
m4_include([import/m4/d-ino.m4])
m4_include([import/m4/d-type.m4])
@@ -1346,3 +1340,9 @@ m4_include([import/m4/wmemchr.m4])
m4_include([import/m4/wmempcpy.m4])
m4_include([import/m4/year2038.m4])
m4_include([import/m4/zzgnulib.m4])
+m4_include([../config/codeset.m4])
+m4_include([../config/depstand.m4])
+m4_include([../config/largefile.m4])
+m4_include([../config/lead-dot.m4])
+m4_include([../config/override.m4])
+m4_include([../config/plugins.m4])
diff --git a/gnulib/configure b/gnulib/configure
index cc7e8287d5a..cb2a11359a1 100644
--- a/gnulib/configure
+++ b/gnulib/configure
@@ -8433,7 +8433,7 @@ else
int
main ()
{
-char* cs = nl_langinfo(CODESET); return !cs;
+char* cs = nl_langinfo(CODESET);
;
return 0;
}
diff --git a/gnulib/import/Makefile.in b/gnulib/import/Makefile.in
index 9893d17c28b..1899bebba36 100644
--- a/gnulib/import/Makefile.in
+++ b/gnulib/import/Makefile.in
@@ -259,12 +259,7 @@ target_triplet = @target@
@GL_COND_OBJ_WMEMPCPY_TRUE@am__append_81 = wmempcpy.c
subdir = import
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \
- $(top_srcdir)/../config/largefile.m4 \
- $(top_srcdir)/../config/lead-dot.m4 \
- $(top_srcdir)/../config/override.m4 \
- $(top_srcdir)/../config/plugins.m4 \
- $(top_srcdir)/import/m4/00gnulib.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/import/m4/00gnulib.m4 \
$(top_srcdir)/import/m4/__inline.m4 \
$(top_srcdir)/import/m4/absolute-header.m4 \
$(top_srcdir)/import/m4/alloca.m4 \
@@ -277,7 +272,6 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \
$(top_srcdir)/import/m4/clock_time.m4 \
$(top_srcdir)/import/m4/close.m4 \
$(top_srcdir)/import/m4/closedir.m4 \
- $(top_srcdir)/import/m4/codeset.m4 \
$(top_srcdir)/import/m4/ctype_h.m4 \
$(top_srcdir)/import/m4/d-ino.m4 \
$(top_srcdir)/import/m4/d-type.m4 \
@@ -434,7 +428,13 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \
$(top_srcdir)/import/m4/wmemchr.m4 \
$(top_srcdir)/import/m4/wmempcpy.m4 \
$(top_srcdir)/import/m4/year2038.m4 \
- $(top_srcdir)/import/m4/zzgnulib.m4 $(top_srcdir)/configure.ac
+ $(top_srcdir)/import/m4/zzgnulib.m4 \
+ $(top_srcdir)/../config/codeset.m4 \
+ $(top_srcdir)/../config/depstand.m4 \
+ $(top_srcdir)/../config/largefile.m4 \
+ $(top_srcdir)/../config/lead-dot.m4 \
+ $(top_srcdir)/../config/override.m4 \
+ $(top_srcdir)/../config/plugins.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(noinst_HEADERS)
--
2.42.1
reply other threads:[~2023-11-15 15:18 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20231115151806.2556428-1-sam@gentoo.org \
--to=sam@gentoo.org \
--cc=binutils@sourceware.org \
--cc=gdb-patches@sourceware.org \
/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).