rpms/glibc
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use /usr/bin/python3 for benchmarks scripts (#1577223)

Browse Source
This commit is contained in:
Florian Weimer 2018-05-11 16:20:01 +02:00
parent 19400997dd
commit 9512708e42
2 changed files with 46 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
glibc-python3.patch Normal file
View File

@ -0,0 +1,40 @@
Use python3 for installed executable python scripts.
Fedora is a Python3-only distribution:
https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3
This fixes build failures where builders may strictly enforce only
python3 during a transitional phase.
Author: Carlos O'Donell <carlos@redhat.com>
diff --git a/benchtests/scripts/compare_bench.py b/benchtests/scripts/compare_bench.py
index ea25f778c09bba9d..b53beb3c6e32c3cf 100755
--- a/benchtests/scripts/compare_bench.py
+++ b/benchtests/scripts/compare_bench.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
# Copyright (C) 2015-2018 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
#
diff --git a/benchtests/scripts/import_bench.py b/benchtests/scripts/import_bench.py
index 602b3f954d4801a6..76bf1528a5418748 100644
--- a/benchtests/scripts/import_bench.py
+++ b/benchtests/scripts/import_bench.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
# Copyright (C) 2015-2018 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
#
diff --git a/benchtests/scripts/validate_benchout.py b/benchtests/scripts/validate_benchout.py
index 6147f05bec3a4844..9a5c7947ee4ed7e9 100755
--- a/benchtests/scripts/validate_benchout.py
+++ b/benchtests/scripts/validate_benchout.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
# Copyright (C) 2014-2018 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
#

7
glibc.spec
View File

@ -1,6 +1,6 @@
%define glibcsrcdir glibc-2.27-37-g39071a5539
%define glibcversion 2.27
%define glibcrelease 8%{?dist}
%define glibcrelease 9%{?dist}
# Pre-release tarballs are pulled in from git using a command that is
# effectively:
#
@ -235,6 +235,7 @@ Patch2054: glibc-collation-cldr-12.patch
Patch2055: glibc-collation-cldr-13.patch
Patch2056: glibc-collation-cldr-14.patch
Patch2057: glibc-collation-cldr-15.patch
Patch2058: glibc-python3.patch
##############################################################################
# End of glibc patches.
@ -777,6 +778,7 @@ microbenchmark tests on the system.
%patch2055 -p1
%patch2056 -p1
%patch2057 -p1
%patch2058 -p1
##############################################################################
# %%prep - Additional prep required...
@ -1966,6 +1968,9 @@ fi
%endif
%changelog
* Fri May 11 2018 Florian Weimer <fweimer@redhat.com> - 2.27-9
- Use /usr/bin/python3 for benchmarks scripts (#1577223)
* Thu Mar 29 2018 Florian Weimer <fweimer@redhat.com> - 2.27-8
- Auto-sync with upstream branch release/2.27/master,
commit 39071a55392d2d2e0b75fb19f2b48d661c4cc682.