|
|
ddb6764 |
diff -rupN Python-2.7.13/Lib/distutils/command/build_ext.py Python-2.7.13-new/Lib/distutils/command/build_ext.py
|
|
|
ddb6764 |
--- Python-2.7.13/Lib/distutils/command/build_ext.py 2017-01-21 01:46:08.289588519 +0100
|
|
|
ddb6764 |
+++ Python-2.7.13-new/Lib/distutils/command/build_ext.py 2017-01-21 01:46:11.183557621 +0100
|
|
|
ddb6764 |
@@ -227,9 +227,10 @@ class build_ext (Command):
|
|
|
ddb6764 |
if sys.platform[:6] == 'cygwin' or sys.platform[:6] == 'atheos':
|
|
|
ddb6764 |
if sys.executable.startswith(os.path.join(sys.exec_prefix, "bin")):
|
|
|
ddb6764 |
# building third party extensions
|
|
|
ddb6764 |
+ config_dir_name = os.path.basename(sysconfig.get_config_var('LIBPL'))
|
|
|
ddb6764 |
self.library_dirs.append(os.path.join(sys.prefix, "lib",
|
|
|
ddb6764 |
"python" + get_python_version(),
|
|
|
ddb6764 |
- "config"))
|
|
|
ddb6764 |
+ config_dir_name))
|
|
|
ddb6764 |
else:
|
|
|
ddb6764 |
# building python standard extensions
|
|
|
ddb6764 |
self.library_dirs.append('.')
|
|
|
ddb6764 |
diff -rupN Python-2.7.13/Lib/sysconfig.py Python-2.7.13-new/Lib/sysconfig.py
|
|
|
ddb6764 |
--- Python-2.7.13/Lib/sysconfig.py 2017-01-21 01:46:11.182557632 +0100
|
|
|
ddb6764 |
+++ Python-2.7.13-new/Lib/sysconfig.py 2017-01-21 01:46:11.184557610 +0100
|
|
|
ddb6764 |
@@ -27,13 +27,13 @@ _INSTALL_SCHEMES = {
|
|
|
ddb6764 |
'data' : '{base}',
|
|
|
ddb6764 |
},
|
|
|
ddb6764 |
'nt': {
|
|
|
ddb6764 |
- 'stdlib': '{base}/Lib',
|
|
|
ddb6764 |
- 'platstdlib': '{base}/Lib',
|
|
|
ddb6764 |
- 'purelib': '{base}/Lib/site-packages',
|
|
|
ddb6764 |
- 'platlib': '{base}/Lib/site-packages',
|
|
|
ddb6764 |
- 'include': '{base}/Include',
|
|
|
ddb6764 |
- 'platinclude': '{base}/Include',
|
|
|
ddb6764 |
- 'scripts': '{base}/Scripts',
|
|
|
ddb6764 |
+ 'stdlib': '{base}/lib/python{py_version_short}',
|
|
|
ddb6764 |
+ 'platstdlib': '{base}/lib/python{py_version_short}',
|
|
|
ddb6764 |
+ 'purelib': '{base}/lib/python{py_version_short}',
|
|
|
ddb6764 |
+ 'platlib': '{base}/lib/python{py_version_short}',
|
|
|
ddb6764 |
+ 'include': '{base}/include/python{py_version_short}',
|
|
|
ddb6764 |
+ 'platinclude': '{base}/include/python{py_version_short}',
|
|
|
ddb6764 |
+ 'scripts': '{base}/bin',
|
|
|
ddb6764 |
'data' : '{base}',
|
|
|
ddb6764 |
},
|
|
|
ddb6764 |
'os2': {
|
|
|
ddb6764 |
@@ -56,12 +56,12 @@ _INSTALL_SCHEMES = {
|
|
|
ddb6764 |
'data' : '{userbase}',
|
|
|
ddb6764 |
},
|
|
|
ddb6764 |
'nt_user': {
|
|
|
ddb6764 |
- 'stdlib': '{userbase}/Python{py_version_nodot}',
|
|
|
ddb6764 |
- 'platstdlib': '{userbase}/Python{py_version_nodot}',
|
|
|
ddb6764 |
- 'purelib': '{userbase}/Python{py_version_nodot}/site-packages',
|
|
|
ddb6764 |
- 'platlib': '{userbase}/Python{py_version_nodot}/site-packages',
|
|
|
ddb6764 |
- 'include': '{userbase}/Python{py_version_nodot}/Include',
|
|
|
ddb6764 |
- 'scripts': '{userbase}/Scripts',
|
|
|
ddb6764 |
+ 'stdlib': '{userbase}/lib/python{py_version_short}',
|
|
|
ddb6764 |
+ 'platstdlib': '{userbase}/lib/python{py_version_short}',
|
|
|
ddb6764 |
+ 'purelib': '{userbase}/lib/python{py_version_short}',
|
|
|
ddb6764 |
+ 'platlib': '{userbase}/lib/python{py_version_short}',
|
|
|
ddb6764 |
+ 'include': '{userbase}/include/python{py_version_short}',
|
|
|
ddb6764 |
+ 'scripts': '{userbase}/bin',
|
|
|
ddb6764 |
'data' : '{userbase}',
|
|
|
ddb6764 |
},
|
|
|
ddb6764 |
'posix_user': {
|
|
|
ddb6764 |
@@ -390,7 +390,7 @@ def _init_non_posix(vars):
|
|
|
ddb6764 |
vars['INCLUDEPY'] = get_path('include')
|
|
|
ddb6764 |
vars['SO'] = '.pyd'
|
|
|
ddb6764 |
vars['EXE'] = '.exe'
|
|
|
ddb6764 |
- vars['VERSION'] = _PY_VERSION_SHORT_NO_DOT
|
|
|
ddb6764 |
+ vars['VERSION'] = _PY_VERSION_SHORT
|
|
|
ddb6764 |
vars['BINDIR'] = os.path.dirname(_safe_realpath(sys.executable))
|
|
|
ddb6764 |
|
|
|
ddb6764 |
#
|