diff --git a/benchtests-Set-float-type-on-threshold-argument.patch b/benchtests-Set-float-type-on-threshold-argument.patch new file mode 100644 index 0000000000000000000000000000000000000000..fa68564ca4e0c2b30695720d43559d4aa9d0a1a2 --- /dev/null +++ b/benchtests-Set-float-type-on-threshold-argument.patch @@ -0,0 +1,33 @@ +From c892ae04f47908479220247a311bc0067229b592 Mon Sep 17 00:00:00 2001 +From: Leonardo Sandoval +Date: Thu, 4 Oct 2018 16:40:36 -0500 +Subject: [PATCH] benchtests: Set float type on --threshold argument + +Otherwise, we see the following runtime error when using the parameter: + + File "./glibc/benchtests/scripts/compare_bench.py", line 46, in do_compare + if d > threshold: +TypeError: '>' not supported between instances of 'float' and 'str' + + * benchtests/scripts/compare_bench.py (main): set float type on + threshold argument. +--- + benchtests/scripts/compare_bench.py | 2 +- + 1 files changed, 1 insertions(+), 1 deletion(-) + +diff --git a/benchtests/scripts/compare_bench.py b/benchtests/scripts/compare_bench.py +index 88e8911d81..f4b7742f90 100755 +--- a/benchtests/scripts/compare_bench.py ++++ b/benchtests/scripts/compare_bench.py +@@ -175,7 +175,7 @@ if __name__ == '__main__': + parser.add_argument('--schema', + default=os.path.join(os.path.dirname(os.path.realpath(__file__)),'benchout.schema.json'), + help='JSON file to validate source/dest files (default: %(default)s)') +- parser.add_argument('--threshold', default=10.0, help='Only print those with equal or higher threshold (default: %(default)s)') ++ parser.add_argument('--threshold', default=10.0, type=float, help='Only print those with equal or higher threshold (default: %(default)s)') + + args = parser.parse_args() + +-- +2.43.7 + diff --git a/glibc.spec b/glibc.spec index a6143cfe68ed2aec736b880cf5c94c17d39f9eb1..2611e1b54bd75c9146b6c860e378c2a9178cc175 100644 --- a/glibc.spec +++ b/glibc.spec @@ -62,7 +62,7 @@ ############################################################################## Name: glibc Version: 2.28 -Release: 110 +Release: 111 Summary: The GNU libc libraries License: %{all_license} URL: http://www.gnu.org/software/glibc/ @@ -179,6 +179,7 @@ Patch92: backport-0002-posix-Fix-fnmatch.c-on-bootstrap.patch Patch93: backport-0003-posix-Falling-back-to-non-wide-mode-in-case-of-encod.patch Patch94: backport-0004-posix-Remove-alloca-usage-for-internal-fnmatch-imple.patch Patch95: posix-Fix-double-free-after-allocation-failure-in-re.patch +Patch96: benchtests-Set-float-type-on-threshold-argument.patch Provides: ldconfig rtld(GNU_HASH) bundled(gnulib) @@ -1296,6 +1297,9 @@ fi %endif %changelog +* Tue Aug 05 2025 panzhe - 2.28-111 +- benchtests: Set float type on --threshold argument + * Fri Aug 01 2025 panzhe - 2.28-110 - Type:update - ID:NA