From 63025526933096fb90ac5498cc9e90a90a11b45a Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 24 Mar 2024 01:28:49 +0100 Subject: [PATCH] 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. --- ChangeLog | 8 ++++++++ pygnulib/GLModuleSystem.py | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 054c6c7fa4..c032a315f8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2024-03-23 Bruno Haible + + 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. + 2024-03-23 Collin Funk gnulib-tool.py: Don't print Python bools in gnulib-cache.m4. 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) -- 2.39.5