From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1879) id B649F3858CD1; Tue, 12 Mar 2024 02:44:25 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B649F3858CD1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1710211465; bh=+8O76CDXaFCbGE+W1VMKtsxVkYELP7O6889kQOhLU08=; h=From:To:Subject:Date:From; b=vO0kryXl7xVMTi6R+Qy8Hv1KTDTaf1d5kJuuRwPyCR7l1JKuluTx6SuelaOsZhwUO pudjJms8IC+ss5+9RMnaaXkY37p3pI54P0/2wXVYQEVXtukJ+Btzm6eXR7t+M4ogzU 3e5wWRCytCERT94j58Stwy86/hrwGuFkdjDRYpfY= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Simon Marchi To: bfd-cvs@sourceware.org, gdb-cvs@sourceware.org Subject: [binutils-gdb] gnulib: re-generate build files X-Act-Checkin: binutils-gdb X-Git-Author: Simon Marchi X-Git-Refname: refs/heads/master X-Git-Oldrev: 402c361af6454b37d0f31a41c8b08e7d673d5e37 X-Git-Newrev: d404349e5f9a55cbfffff86b6c97e3b5308269d1 Message-Id: <20240312024425.B649F3858CD1@sourceware.org> Date: Tue, 12 Mar 2024 02:44:25 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3Dd404349e5f9a= 55cbfffff86b6c97e3b5308269d1 commit d404349e5f9a55cbfffff86b6c97e3b5308269d1 Author: Simon Marchi Date: Mon Mar 11 22:41:19 2024 -0400 gnulib: re-generate build files =20 I see some changes in the generated files when running update-gnulib.sh. The changes appeared with commit 35b38b0182d0 ("Finalized intl-update patches (trois)"). This is most likely due to how the autotools were ran in that commit, possibly with some different -I arguments. =20 Change-Id: Idaad8084b0e91e22d066f573775e21d0c7a039cb Diff: --- gnulib/Makefile.in | 16 ++++++++-------- gnulib/aclocal.m4 | 12 ++++++------ gnulib/configure | 2 +- gnulib/import/Makefile.in | 16 ++++++++-------- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/gnulib/Makefile.in b/gnulib/Makefile.in index 2559d8022d9..49c803b83a9 100644 --- a/gnulib/Makefile.in +++ b/gnulib/Makefile.in @@ -107,7 +107,12 @@ host_triplet =3D @host@ target_triplet =3D @target@ subdir =3D . ACLOCAL_M4 =3D $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps =3D $(top_srcdir)/import/m4/00gnulib.m4 \ +am__aclocal_m4_deps =3D $(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 \ $(top_srcdir)/import/m4/__inline.m4 \ $(top_srcdir)/import/m4/absolute-header.m4 \ $(top_srcdir)/import/m4/alloca.m4 \ @@ -120,6 +125,7 @@ am__aclocal_m4_deps =3D $(top_srcdir)/import/m4/00gnuli= b.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 \ @@ -276,13 +282,7 @@ am__aclocal_m4_deps =3D $(top_srcdir)/import/m4/00gnul= ib.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)/../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 + $(top_srcdir)/import/m4/zzgnulib.m4 $(top_srcdir)/configure.ac am__configure_deps =3D $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON =3D $(srcdir)/Makefile.am $(top_srcdir)/configure \ diff --git a/gnulib/aclocal.m4 b/gnulib/aclocal.m4 index c7f866eb8bf..707108d7abf 100644 --- a/gnulib/aclocal.m4 +++ b/gnulib/aclocal.m4 @@ -1169,6 +1169,11 @@ AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR =20 +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]) @@ -1182,6 +1187,7 @@ 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]) @@ -1340,9 +1346,3 @@ 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 cb2a11359a1..cc7e8287d5a 100755 --- a/gnulib/configure +++ b/gnulib/configure @@ -8433,7 +8433,7 @@ else int main () { -char* cs =3D nl_langinfo(CODESET); +char* cs =3D nl_langinfo(CODESET); return !cs; ; return 0; } diff --git a/gnulib/import/Makefile.in b/gnulib/import/Makefile.in index 1899bebba36..9893d17c28b 100644 --- a/gnulib/import/Makefile.in +++ b/gnulib/import/Makefile.in @@ -259,7 +259,12 @@ target_triplet =3D @target@ @GL_COND_OBJ_WMEMPCPY_TRUE@am__append_81 =3D wmempcpy.c subdir =3D import ACLOCAL_M4 =3D $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps =3D $(top_srcdir)/import/m4/00gnulib.m4 \ +am__aclocal_m4_deps =3D $(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 \ $(top_srcdir)/import/m4/__inline.m4 \ $(top_srcdir)/import/m4/absolute-header.m4 \ $(top_srcdir)/import/m4/alloca.m4 \ @@ -272,6 +277,7 @@ am__aclocal_m4_deps =3D $(top_srcdir)/import/m4/00gnuli= b.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 \ @@ -428,13 +434,7 @@ am__aclocal_m4_deps =3D $(top_srcdir)/import/m4/00gnul= ib.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)/../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 + $(top_srcdir)/import/m4/zzgnulib.m4 $(top_srcdir)/configure.ac am__configure_deps =3D $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON =3D $(srcdir)/Makefile.am $(noinst_HEADERS)