diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2018-10-26 15:47:23 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2018-10-26 15:47:23 +0000 |
| commit | e5b8756dc2355c315247b710da8d50d48b7a9728 (patch) | |
| tree | 8c3fafa613c6e5c16729d4fba5127dadf4deb1fc | |
| parent | ba5b14c7613980dfefcad6b6e88f913e5f596c59 (diff) | |
| download | glibc-e5b8756dc2355c315247b710da8d50d48b7a9728.tar.gz glibc-e5b8756dc2355c315247b710da8d50d48b7a9728.tar.xz glibc-e5b8756dc2355c315247b710da8d50d48b7a9728.zip | |
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.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rwxr-xr-x | scripts/build-many-glibcs.py | 11 |
2 files changed, 5 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog index 8f2ccefa02..736d85f221 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2018-10-26 Joseph Myers <joseph@codesourcery.com> + + * scripts/build-many-glibcs.py: Remove compatibility for missing + os.cpu_count and re.fullmatch. + 2018-10-26 Szabolcs Nagy <szabolcs.nagy@arm.com> [BZ #23822] diff --git a/scripts/build-many-glibcs.py b/scripts/build-many-glibcs.py index 3f288e0e0b..1bf8ee1d2b 100755 --- a/scripts/build-many-glibcs.py +++ b/scripts/build-many-glibcs.py @@ -50,17 +50,6 @@ 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: class _CompletedProcess: |