Fix for multiarch dir discovering

This commit is contained in:
Anton Kirilenko 2013-03-28 17:55:14 +04:00
parent 7576343596
commit 7c760db6f8

View file

@ -1,13 +1,16 @@
--- Python-3.3.0/Lib/distutils/sysconfig.py 2012-09-29 12:00:28.000000000 +0400
+++ Python-3.3.0/Lib/distutils/sysconfig.py 2013-03-28 14:06:57.221228944 +0400
@@ -107,7 +107,10 @@
+++ Python-3.3.0-1/Lib/distutils/sysconfig.py 2013-03-28 17:53:13.945246411 +0400
@@ -107,7 +107,13 @@
incdir = os.path.join(get_config_var('srcdir'), 'Include')
return os.path.normpath(incdir)
python_dir = 'python' + get_python_version() + build_flags
- return os.path.join(prefix, "include", python_dir)
+ multiarch = ''
+ if plat_specific:
+ multiarch = 'multiarch-%s-%s' % (os.uname()[4], sys.platform)
+ arch = os.uname()[4]
+ if arch.endswith('86'):
+ arch = 'i386'
+ multiarch = 'multiarch-%s-%s' % (arch, sys.platform)
+ return os.path.join(prefix, "include", multiarch, python_dir)
elif os.name == "nt":
return os.path.join(prefix, "include")