From 987535a15d4d2902818661feb6d6b363e4d7af2b Mon Sep 17 00:00:00 2001 From: Collin Funk Date: Sat, 4 May 2024 23:46:02 -0700 Subject: [PATCH] gnulib-tool: Ignore autom4te.cache when using GNULIB_TOOL_IMPL=sh+py. Reported by Paul Eggert in: . * gnulib-tool: Don't compare the autom4te.cache directory since requests are not sorted in Autoconf version 2.71 and below. --- ChangeLog | 8 ++++++++ gnulib-tool | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 4b5b9bad06..f8e20e06c6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2024-05-04 Collin Funk + + gnulib-tool: Ignore autom4te.cache when using GNULIB_TOOL_IMPL=sh+py. + Reported by Paul Eggert in: + . + * gnulib-tool: Don't compare the autom4te.cache directory since requests + are not sorted in Autoconf version 2.71 and below. + 2024-05-04 Bruno Haible readutmp, boot-time: Work around a Cygwin 3.5.3 bug. diff --git a/gnulib-tool b/gnulib-tool index 56c4473318..789fe916a8 100755 --- a/gnulib-tool +++ b/gnulib-tool @@ -209,7 +209,7 @@ case "$GNULIB_TOOL_IMPL" in else diff_options= fi - diff -r $diff_options --exclude=__pycache__ -q . "$tmp" >/dev/null || + diff -r $diff_options --exclude=__pycache__ --exclude=autom4te.cache -q . "$tmp" >/dev/null || func_fatal_error "gnulib-tool.py produced different files than gnulib-tool.sh! Compare `pwd` and $tmp." # Compare the two outputs. diff -q "$tmp-sh-out" "$tmp-py-out" >/dev/null || -- 2.11.4.GIT