[glibc] scripts: sort-makefile-lines.py

[glibc] scripts: sort-makefile-lines.py

[Carlos O'Donell]

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=b0528456a606faf996ae8046512d623a6d22d0cc

commit b0528456a606faf996ae8046512d623a6d22d0cc
Author: Carlos O'Donell <carlos@redhat.com>
Date:   Wed May 17 09:16:41 2023 -0400

    scripts: sort-makefile-lines.py
    
    We must return < 0, 0, or > 0 as the result of the comparison function
    for cmp_to_key() to work correctly across all comparisons.
    
    Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>

Diff:
---
 scripts/sort-makefile-lines.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/scripts/sort-makefile-lines.py b/scripts/sort-makefile-lines.py
index fd657df970..c0badebf8c 100755
--- a/scripts/sort-makefile-lines.py
+++ b/scripts/sort-makefile-lines.py
@@ -102,7 +102,10 @@ def glibc_makefile_numeric(string1, string2):
             # string1 and string2 both share a prefix and
             # have a numeric suffix that can be compared.
             # Sort order is based on the numeric suffix.
-            return int(var1.group(1)) > int(var2.group(1))
+            # If the suffix is the same return 0, otherwise
+            # > 0 for greater-than, and < 0 for less-than.
+            # This is equivalent to the numerical difference.
+            return int(var1.group(1)) - int(var2.group(1))
     # Default to strcoll.
     return locale.strcoll(string1, string2)