Scons: refine the usage of distutils by respecting site-packages location for specific arch's, use the get_python_version() helper, and normpath() to avoid double '/' - addresses #219 and furthers #209
This commit is contained in:
parent
d11654895b
commit
d62fe5eb1a
1 changed files with 5 additions and 4 deletions
|
@ -526,11 +526,12 @@ else:
|
||||||
sys_prefix = "%s -c 'import sys; print sys.prefix'" % env['PYTHON']
|
sys_prefix = "%s -c 'import sys; print sys.prefix'" % env['PYTHON']
|
||||||
env['PYTHON_SYS_PREFIX'] = call(sys_prefix)
|
env['PYTHON_SYS_PREFIX'] = call(sys_prefix)
|
||||||
|
|
||||||
site_packages = "%s -c 'from distutils.sysconfig import get_python_lib; print get_python_lib()'" % env['PYTHON']
|
# Note: we use the plat_specific argument here to make sure to respect the arch-specific site-packages location
|
||||||
|
site_packages = "%s -c 'from distutils.sysconfig import get_python_lib; print get_python_lib(plat_specific=True)'" % env['PYTHON']
|
||||||
env['PYTHON_SITE_PACKAGES'] = call(site_packages)
|
env['PYTHON_SITE_PACKAGES'] = call(site_packages)
|
||||||
|
|
||||||
sys_version = "%s -c 'import sys; print sys.version'" % env['PYTHON']
|
sys_version = "%s -c 'from distutils.sysconfig import get_python_version; print get_python_version()'" % env['PYTHON']
|
||||||
env['PYTHON_VERSION'] = call(sys_version)[0:3]
|
env['PYTHON_VERSION'] = call(sys_version)
|
||||||
|
|
||||||
py_includes = "%s -c 'from distutils.sysconfig import get_python_inc; print get_python_inc()'" % env['PYTHON']
|
py_includes = "%s -c 'from distutils.sysconfig import get_python_inc; print get_python_inc()'" % env['PYTHON']
|
||||||
env['PYTHON_INCLUDES'] = call(py_includes)
|
env['PYTHON_INCLUDES'] = call(py_includes)
|
||||||
|
@ -565,7 +566,7 @@ else:
|
||||||
|
|
||||||
color_print(4,'Python %s prefix... %s' % (env['PYTHON_VERSION'], env['PYTHON_SYS_PREFIX']))
|
color_print(4,'Python %s prefix... %s' % (env['PYTHON_VERSION'], env['PYTHON_SYS_PREFIX']))
|
||||||
|
|
||||||
color_print(4,'Python bindings will install in... %s' % os.path.abspath(env['PYTHON_INSTALL_LOCATION']))
|
color_print(4,'Python bindings will install in... %s' % os.path.normpath(env['PYTHON_INSTALL_LOCATION']))
|
||||||
|
|
||||||
SConscript('bindings/python/SConscript')
|
SConscript('bindings/python/SConscript')
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue