From patchwork Tue Mar 12 02:44:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 87064 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 3A4D238582BC for ; Tue, 12 Mar 2024 02:45:10 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp.polymtl.ca (smtp.polymtl.ca [132.207.4.11]) by sourceware.org (Postfix) with ESMTPS id 170A23858431 for ; Tue, 12 Mar 2024 02:44:45 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 170A23858431 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=polymtl.ca Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=polymtl.ca ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 170A23858431 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=132.207.4.11 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1710211487; cv=none; b=pZSKlmG22jn535sGzLWrKek2DeEpg8IsHnIF1iqZrJbs5F1DPn88S5Kp52sN/pKwrgAlNVSJDCDWAgBcqCjmbhHBRS49W1GYADotkilvnVlRNIXG+AKt+snsRu3ZLn3zjsnWVZ7HcU1Ri5sXyptsMy1+SEWTndWEsVW/ZEKw//I= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1710211487; c=relaxed/simple; bh=k7RRFtOCa/ciCIB/g0FDBwq9Avyu1HDDcY9tiG/t0qE=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=jEow/wHsIEoHa6N4+5mXKQ+SXg91eakxs6vPOWSHoESschBcLLQD0FgOZXgZtypUsh3iTMnbG1XbkbX5AHVXK1v/Bgm4EUWa8OhPspvA7uxWoUzNdrR5wR6NFHCqg30wFXCDvUJf76WbEitgwJGVT/jYdDxc9tobyyCZuw2yqJQ= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from simark.ca (simark.ca [158.69.221.121]) (authenticated bits=0) by smtp.polymtl.ca (8.14.7/8.14.7) with ESMTP id 42C2ibCG019468 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 11 Mar 2024 22:44:42 -0400 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp.polymtl.ca 42C2ibCG019468 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=polymtl.ca; s=default; t=1710211482; bh=1s53V6CpVUwmeAWYC54hmAfzjpUhyQnFVDJRQCUFwyg=; h=From:To:Cc:Subject:Date:From; b=NjFwLktfqzScQOySUUWCPr711WkVZ7mAQs94xLltCz7lGNfwY80nyyb5EAMZTol9F 3i4OZz5lysw0m6O5Scf1MLla21SNepWAXHMYJlEmsq+20UXFj76PdTPk2Ibrxxmoh6 +NbX2r4m9kviyObLsfucJ3WOj9gY1hWU2MKHzIvA= Received: from simark.localdomain (modemcable238.237-201-24.mc.videotron.ca [24.201.237.238]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPSA id C740E1E030; Mon, 11 Mar 2024 22:44:37 -0400 (EDT) From: Simon Marchi To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [pushed] gnulib: re-generate build files Date: Mon, 11 Mar 2024 22:44:32 -0400 Message-ID: <20240312024435.30707-1-simon.marchi@polymtl.ca> X-Mailer: git-send-email 2.44.0 MIME-Version: 1.0 X-Poly-FromMTA: (simark.ca [158.69.221.121]) at Tue, 12 Mar 2024 02:44:37 +0000 X-Spam-Status: No, score=-3188.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org 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. Change-Id: Idaad8084b0e91e22d066f573775e21d0c7a039cb --- gnulib/Makefile.in | 16 ++++++++-------- gnulib/aclocal.m4 | 12 ++++++------ gnulib/configure | 2 +- gnulib/import/Makefile.in | 16 ++++++++-------- 4 files changed, 23 insertions(+), 23 deletions(-) base-commit: 402c361af6454b37d0f31a41c8b08e7d673d5e37 diff --git a/gnulib/Makefile.in b/gnulib/Makefile.in index 2559d8022d95..49c803b83a91 100644 --- a/gnulib/Makefile.in +++ b/gnulib/Makefile.in @@ -107,7 +107,12 @@ host_triplet = @host@ target_triplet = @target@ subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/import/m4/00gnulib.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 \ $(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 = $(top_srcdir)/import/m4/00gnulib.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 = $(top_srcdir)/import/m4/00gnulib.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 = $(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 c7f866eb8bff..707108d7abfc 100644 --- a/gnulib/aclocal.m4 +++ b/gnulib/aclocal.m4 @@ -1169,6 +1169,11 @@ 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]) @@ -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 cb2a11359a19..cc7e8287d5a0 100755 --- a/gnulib/configure +++ b/gnulib/configure @@ -8433,7 +8433,7 @@ else int main () { -char* cs = nl_langinfo(CODESET); +char* cs = nl_langinfo(CODESET); return !cs; ; return 0; } diff --git a/gnulib/import/Makefile.in b/gnulib/import/Makefile.in index 1899bebba368..9893d17c28b9 100644 --- a/gnulib/import/Makefile.in +++ b/gnulib/import/Makefile.in @@ -259,7 +259,12 @@ 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)/import/m4/00gnulib.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 \ $(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 = $(top_srcdir)/import/m4/00gnulib.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 = $(top_srcdir)/import/m4/00gnulib.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 = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(noinst_HEADERS)