dropme: reproducible output

skosukhin · Apr 25, 2024 · e6b6f79 · e6b6f79
1 parent 3035387
commit e6b6f79
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/mkhelper/depgen.py b/mkhelper/depgen.py
@@ -564,7 +564,9 @@ def format_debug_line(line, msg):
                     "\n#\n",
                     "# Parsed arguments:\n#  ",
                     "\n#  ".join(
-                        [k + "=" + str(v) for k, v in vars(args).items()]
+                        sorted(
+                            [k + "=" + str(v) for k, v in vars(args).items()]
+                        )
                     ),
                     "\n",
                 ]
@@ -592,15 +594,15 @@ def format_debug_line(line, msg):
 def gen_lc_deps(src_name, lc_files):
     result = []
     if src_name and lc_files:
-        result.append("{0}: {1}\n".format(src_name, " ".join(lc_files)))
+        result.append("{0}: {1}\n".format(src_name, " ".join(sorted(lc_files))))
     return result
 
 
 def gen_include_deps(src_name, obj_name, dep_name, included_files):
     result = []
     targets = " ".join(filter(None, (obj_name, dep_name)))
     if targets:
-        prereqs = " ".join(filter(None, [src_name] + list(included_files)))
+        prereqs = " ".join(filter(None, [src_name] + sorted(included_files)))
         if prereqs:
             result.append("{0}: {1}\n".format(targets, prereqs))
     return result
@@ -613,8 +615,10 @@ def gen_module_deps(
     if obj_name:
         if provided_modules:
             targets = " ".join(
-                modulenames_to_filenames(
-                    provided_modules, mod_dir, mod_upper, mod_ext
+                sorted(
+                    modulenames_to_filenames(
+                        provided_modules, mod_dir, mod_upper, mod_ext
+                    )
                 )
             )
             result.append("{0}: {1}\n".format(targets, obj_name))
@@ -625,8 +629,10 @@ def gen_module_deps(
         ]
         if required_modules:
             prereqs = " ".join(
-                modulenames_to_filenames(
-                    required_modules, mod_dir, mod_upper, mod_ext
+                sorted(
+                    modulenames_to_filenames(
+                        required_modules, mod_dir, mod_upper, mod_ext
+                    )
                 )
             )
             result.append("{0}: {1}\n".format(obj_name, prereqs))