Kaydet (Commit) 18c47f6a authored tarafından Georg Brandl's avatar Georg Brandl

Patch #1569798: fix a bug in distutils when building Python from a

directory within sys.exec_prefix.
üst b6a87542
...@@ -186,7 +186,7 @@ class build_ext (Command): ...@@ -186,7 +186,7 @@ class build_ext (Command):
# for extensions under Cygwin and AtheOS Python's library directory must be # for extensions under Cygwin and AtheOS Python's library directory must be
# appended to library_dirs # appended to library_dirs
if sys.platform[:6] == 'cygwin' or sys.platform[:6] == 'atheos': if sys.platform[:6] == 'cygwin' or sys.platform[:6] == 'atheos':
if string.find(sys.executable, sys.exec_prefix) != -1: if sys.executable.startswith(os.path.join(sys.exec_prefix, "bin")):
# building third party extensions # building third party extensions
self.library_dirs.append(os.path.join(sys.prefix, "lib", self.library_dirs.append(os.path.join(sys.prefix, "lib",
"python" + get_python_version(), "python" + get_python_version(),
...@@ -199,7 +199,7 @@ class build_ext (Command): ...@@ -199,7 +199,7 @@ class build_ext (Command):
# Python's library directory must be appended to library_dirs # Python's library directory must be appended to library_dirs
if (sys.platform.startswith('linux') or sys.platform.startswith('gnu')) \ if (sys.platform.startswith('linux') or sys.platform.startswith('gnu')) \
and sysconfig.get_config_var('Py_ENABLE_SHARED'): and sysconfig.get_config_var('Py_ENABLE_SHARED'):
if string.find(sys.executable, sys.exec_prefix) != -1: if sys.executable.startswith(os.path.join(sys.exec_prefix, "bin")):
# building third party extensions # building third party extensions
self.library_dirs.append(sysconfig.get_config_var('LIBDIR')) self.library_dirs.append(sysconfig.get_config_var('LIBDIR'))
else: else:
......
...@@ -646,6 +646,9 @@ Tools/Demos ...@@ -646,6 +646,9 @@ Tools/Demos
Build Build
----- -----
- Patch #1569798: fix a bug in distutils when building Python from a
directory within sys.exec_prefix.
- Bug #1675511: Use -Kpic instead of -xcode=pic32 on Solaris/x86. - Bug #1675511: Use -Kpic instead of -xcode=pic32 on Solaris/x86.
- Disable _XOPEN_SOURCE on NetBSD 1.x. - Disable _XOPEN_SOURCE on NetBSD 1.x.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment