|
Lines 1-38
Link Here
|
| 1 |
--- SConscript.orig 2021-09-21 21:53:44 UTC |
|
|
| 2 |
+++ SConscript |
| 3 |
@@ -20,7 +20,7 @@ import re |
| 4 |
import subprocess |
| 5 |
import sys |
| 6 |
import time |
| 7 |
-from distutils import sysconfig |
| 8 |
+import sysconfig |
| 9 |
import SCons |
| 10 |
|
| 11 |
# scons does not like targets that come and go (if cleaning, if python, |
| 12 |
@@ -243,7 +243,7 @@ website = "https://gpsd.io/" |
| 13 |
# Hosting information ends here |
| 14 |
|
| 15 |
|
| 16 |
-PYTHON_SYSCONFIG_IMPORT = 'from distutils import sysconfig' |
| 17 |
+PYTHON_SYSCONFIG_IMPORT = 'import sysconfig' |
| 18 |
|
| 19 |
# Utility productions |
| 20 |
|
| 21 |
@@ -1419,7 +1419,7 @@ if not cleaning and not helping: |
| 22 |
|
| 23 |
# Set up configuration for target Python |
| 24 |
|
| 25 |
-PYTHON_LIBDIR_CALL = 'sysconfig.get_python_lib()' |
| 26 |
+PYTHON_LIBDIR_CALL = 'sysconfig.get_paths()["purelib"]' |
| 27 |
|
| 28 |
PYTHON_CONFIG_NAMES = ['SO'] # Now a fairly degenerate list |
| 29 |
PYTHON_CONFIG_QUOTED = ["'%s'" % s for s in PYTHON_CONFIG_NAMES] |
| 30 |
@@ -1520,7 +1520,7 @@ if not cleaning and not helping and config.env['python |
| 31 |
'import sys', |
| 32 |
'"%d.%d" % sys.version_info[0:2]') |
| 33 |
|
| 34 |
- if 3 > int(sysver[0]) or 6 > int(sysver[2]): |
| 35 |
+ if 3 > int(sysver[0]) or 6 > int(sysver[2:]): |
| 36 |
config.env['aiogps'] = False |
| 37 |
announce("WARNING: Python%s too old (need 3.6): " |
| 38 |
"gps/aiogps.py will not be installed" % |