From: Joseph Myers Date: Fri, 26 Oct 2018 15:47:23 +0000 (+0000) Subject: Remove pre-Python-3.4 compatibility from build-many-glibcs.py. X-Git-Tag: glibc-2.29~365 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e5b8756dc2355c315247b710da8d50d48b7a9728;p=thirdparty%2Fglibc.git Remove pre-Python-3.4 compatibility from build-many-glibcs.py. Since we have consensus on requiring Python 3.4 or later to build glibc, it follows that compatibility with older Python versions is also no longer relevant to auxiliary Python scripts for use in glibc development. This patch removes such compatibility code from build-many-glibcs.py (compatibility code needed for 3.4, which lacks the newer subprocess interface, is kept). Because build-many-glibcs.py is not itself called from the glibc build system, this patch is independent of the configure checks for having a new-enough Python version, which are only relevant to uses of Python from the main build and test process. Tested with build-many-glibcs.py building glibc for aarch64-linux-gnu (with Python 3.4 to make sure that still works). * scripts/build-many-glibcs.py: Remove compatibility for missing os.cpu_count and re.fullmatch. --- diff --git a/ChangeLog b/ChangeLog index 8f2ccefa023..736d85f2214 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2018-10-26 Joseph Myers + + * scripts/build-many-glibcs.py: Remove compatibility for missing + os.cpu_count and re.fullmatch. + 2018-10-26 Szabolcs Nagy [BZ #23822] diff --git a/scripts/build-many-glibcs.py b/scripts/build-many-glibcs.py index 3f288e0e0b6..1bf8ee1d2bf 100755 --- a/scripts/build-many-glibcs.py +++ b/scripts/build-many-glibcs.py @@ -49,17 +49,6 @@ import sys import time import urllib.request -try: - os.cpu_count -except: - import multiprocessing - os.cpu_count = lambda: multiprocessing.cpu_count() - -try: - re.fullmatch -except: - re.fullmatch = lambda p,s,f=0: re.match(p+"\\Z",s,f) - try: subprocess.run except: