I see this test failure: $ GNULIB_TOOL_IMPL=py ./test-create-testdir-4.sh Files ./test-create-testdir-4.result/gllib/Makefile.am and tmp2146793-result/gllib/Makefile.am differ FAIL: gnulib-tool's result has unexpected differences. $ diff -u ./test-create-testdir-4.result/gllib/Makefile.am tmp2146793-result/gllib/Makefile.am --- ./test-create-testdir-4.result/gllib/Makefile.am 2024-03-19 17:44:58.896516035 +0100 +++ tmp2146793-result/gllib/Makefile.am 2024-03-23 19:20:42.073467517 +0100 @@ -6383,7 +6383,7 @@ ## begin gnulib module pmccabe2html -EXTRA_DIST += $(top_srcdir)/build-aux/pmccabe2html $(top_srcdir)/build-aux/pmccabe.css +EXTRA_DIST += $(top_srcdir)/build-aux/pmccabe.css $(top_srcdir)/build-aux/pmccabe2html ## end gnulib module pmccabe2html @@ -7365,7 +7365,7 @@ EXTRA_libgnu_a_SOURCES += relocatable.c -EXTRA_DIST += $(top_srcdir)/build-aux/config.libpath $(top_srcdir)/build-aux/reloc-ldflags $(top_srcdir)/build-aux/libtool-reloc +EXTRA_DIST += $(top_srcdir)/build-aux/config.libpath $(top_srcdir)/build-aux/libtool-reloc $(top_srcdir)/build-aux/reloc-ldflags ## end gnulib module relocatable-prog
Apparently, a file list is sorted by gnulib-tool.py, whereas gnulib-tool.sh does not sort. This patch aligns the behaviour. 2024-03-23 Bruno Haible <br...@clisp.org> gnulib-tool.py: Don't unnecessarily sort an EXTRA_DIST augmentation. * pygnulib/GLModuleSystem.py (GLModule.getAutomakeSnippet_Unconditional): Don't remove duplicates or sort the filenames in the EXTRA_lib_SOURCES augmentation or the EXTRA_DIST augmentation for build-aux. diff --git a/pygnulib/GLModuleSystem.py b/pygnulib/GLModuleSystem.py index c0d9b0365a..b47019dbcc 100644 --- a/pygnulib/GLModuleSystem.py +++ b/pygnulib/GLModuleSystem.py @@ -695,14 +695,14 @@ class GLModule(object): extra_files = filter_filelist(constants.NL, extra_files, '', '.c', '', '') if extra_files != '': - result += 'EXTRA_lib_SOURCES += %s' % ' '.join(sorted(set(extra_files.split(constants.NL)))) + result += 'EXTRA_lib_SOURCES += %s' % ' '.join(extra_files.split(constants.NL)) result += '\n\n' # Synthesize an EXTRA_DIST augmentation also for the files in build-aux buildaux_files = filter_filelist(constants.NL, all_files, 'build-aux/', '', 'build-aux/', '') if buildaux_files != '': buildaux_files = [ joinpath('$(top_srcdir)', auxdir, filename) - for filename in sorted(set(buildaux_files.split(constants.NL))) ] + for filename in buildaux_files.split(constants.NL) ] result += 'EXTRA_DIST += %s' % ' '.join(buildaux_files) result += '\n\n' result = constants.nlconvert(result)