mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-04 03:44:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Closes #16116: Merged fix from 3.3.

Browse source
This commit is contained in:
Vinay Sajip 2012-10-23 20:27:43 +01:00
commit 998b105c68
2 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Lib/distutils/command/build_ext.py
View file

@ -160,6 +160,11 @@ class build_ext(Command):
if isinstance(self.include_dirs, str): if isinstance(self.include_dirs, str):
self.include_dirs = self.include_dirs.split(os.pathsep) self.include_dirs = self.include_dirs.split(os.pathsep)
# If in a virtualenv, add its include directory
# Issue 16116
if sys.exec_prefix != sys.base_exec_prefix:
self.include_dirs.append(os.path.join(sys.exec_prefix, 'include'))
# Put the Python "system" include dir at the end, so that # Put the Python "system" include dir at the end, so that
# any local include dirs take precedence. # any local include dirs take precedence.
self.include_dirs.append(py_include) self.include_dirs.append(py_include)
@ -190,6 +195,8 @@ class build_ext(Command):
# must be the *native* platform. But we don't really support # must be the *native* platform. But we don't really support
# cross-compiling via a binary install anyway, so we let it go. # cross-compiling via a binary install anyway, so we let it go.
self.library_dirs.append(os.path.join(sys.exec_prefix, 'libs')) self.library_dirs.append(os.path.join(sys.exec_prefix, 'libs'))
if sys.base_exec_prefix != sys.prefix: # Issue 16116
self.library_dirs.append(os.path.join(sys.base_exec_prefix, 'libs'))
if self.debug: if self.debug:
self.build_temp = os.path.join(self.build_temp, "Debug") self.build_temp = os.path.join(self.build_temp, "Debug")
else: else:

3
Misc/NEWS
View file

@ -59,6 +59,9 @@ Core and Builtins
Library Library
------- -------
- Issue #16116: Fix include and library paths to be correctwhen building C
extensions in venvs.
- Issue #16245: Fix the value of a few entities in html.entities.html5. - Issue #16245: Fix the value of a few entities in html.entities.html5.
- Issue #16301: Fix the localhost verification in urllib/request.py for file:// - Issue #16301: Fix the localhost verification in urllib/request.py for file://