Hi Paul,
On 5/4/24 3:02 PM, Paul Eggert wrote:
> On 2024-05-04 13:45, Collin Funk wrote:
>> I can't reproduce this (using Fedora 40).
>
> That's odd, as I just now reproduced it on Fedora 40 x86-64 using the
> following from-scratch recipe:
I noticed in your emacs/output.0 it says "Generated by GNU Autoconf 2.71".
I was using Autoconf 2.72 on my system. Using my Emacs directory and
Autoconf ./configure'd from the v2.71 tag:
$ LC_ALL=en_US.utf8 GNULIB_TOOL_IMPL=sh+py admin/merge-gnulib
../gnulib/gnulib-tool: *** gnulib-tool.py produced different files than
gnulib-tool.sh! Compare /home/collin/.local/src/emacs and
/home/collin/.local/src/glpyR1z7xq.
../gnulib/gnulib-tool: *** Stop.
$ diff -ru /home/collin/.local/src/emacs /home/collin/.local/src/glpyR1z7xq
diff -ru /home/collin/.local/src/emacs/autom4te.cache/requests
/home/collin/.local/src/glpyR1z7xq/autom4te.cache/requests
--- /home/collin/.local/src/emacs/autom4te.cache/requests 2024-05-04
15:56:55.496035451 -0700
+++ /home/collin/.local/src/glpyR1z7xq/autom4te.cache/requests
2024-05-04 15:56:25.973984808 -0700
@@ -15,69 +15,69 @@
'configure.ac'
],
{
- 'AM_PROG_CC_C_O' => 1,
- 'AM_PROG_AR' => 1,
- 'AC_CANONICAL_BUILD' => 1,
I'm assuming sometime between 2.71 and 2.72 that file started getting
sorted when it previously didn't?
I think this change should be the proper fix:
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 ||
Can you confirm before I apply it?
Collin
