diff options
| author | doko@ubuntu.com <doko@ubuntu.com> | 2012-06-30 22:35:00 +0200 |
|---|---|---|
| committer | doko@ubuntu.com <doko@ubuntu.com> | 2012-06-30 22:35:00 +0200 |
| commit | 7e6c2e2cc49fa109662d3f04f4c3553596d31937 (patch) | |
| tree | 4509cf98a5f44afdbab2b01128cacaffd4d95f61 | |
| parent | 1abe1c5fe13ca64c54e16db25de7c4dd5578a7c1 (diff) | |
| download | cpython-git-7e6c2e2cc49fa109662d3f04f4c3553596d31937.tar.gz | |
- Issue #14330: For cross builds, don't use host python, use host search paths
for host compiler.
Add NEWS entry, rename _PROJECT_BASE to _PYTHON_PROJECT_BASE.
| -rw-r--r-- | Lib/sysconfig.py | 4 | ||||
| -rw-r--r-- | Misc/NEWS | 7 | ||||
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | configure.ac | 2 |
4 files changed, 11 insertions, 4 deletions
diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py index eccd3041a4..4f0a9a920c 100644 --- a/Lib/sysconfig.py +++ b/Lib/sysconfig.py @@ -139,8 +139,8 @@ if os.name == "nt" and "\\pcbuild\\amd64" in _PROJECT_BASE[-14:].lower(): _PROJECT_BASE = _safe_realpath(os.path.join(_PROJECT_BASE, pardir, pardir)) # set for cross builds -if "_PROJECT_BASE" in os.environ: - _PROJECT_BASE = _safe_realpath(os.environ["_PROJECT_BASE"]) +if "_PYTHON_PROJECT_BASE" in os.environ: + _PROJECT_BASE = _safe_realpath(os.environ["_PYTHON_PROJECT_BASE"]) def _is_python_source_dir(d): for fn in ("Setup.dist", "Setup.local"): @@ -42,6 +42,13 @@ Tools/Demos * C frames that are garbage-collecting * C frames that are due to the invocation of a PyCFunction +Build +----- + +- Issue #14330: For cross builds, don't use host python, use host search paths + for host compiler. + + What's New in Python 3.3.0 Beta 1? ================================== @@ -2898,7 +2898,7 @@ $as_echo_n "checking for python interpreter for cross build... " >&6; } fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $interp" >&5 $as_echo "$interp" >&6; } - PYTHON_FOR_BUILD="_PROJECT_BASE=$srcdir"' _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(srcdir)/Lib:$(srcdir)/Lib/plat-$(MACHDEP) '$interp + PYTHON_FOR_BUILD="_PYTHON_PROJECT_BASE=$srcdir"' _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(srcdir)/Lib:$(srcdir)/Lib/plat-$(MACHDEP) '$interp fi else PYTHON_FOR_BUILD='./$(BUILDPYTHON) -E' diff --git a/configure.ac b/configure.ac index 91a588a58c..2aaec844c4 100644 --- a/configure.ac +++ b/configure.ac @@ -49,7 +49,7 @@ if test "$cross_compiling" = yes; then AC_MSG_ERROR([python$PACKAGE_VERSION interpreter not found]) fi AC_MSG_RESULT($interp) - PYTHON_FOR_BUILD="_PROJECT_BASE=$srcdir"' _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(srcdir)/Lib:$(srcdir)/Lib/plat-$(MACHDEP) '$interp + PYTHON_FOR_BUILD="_PYTHON_PROJECT_BASE=$srcdir"' _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(srcdir)/Lib:$(srcdir)/Lib/plat-$(MACHDEP) '$interp fi else PYTHON_FOR_BUILD='./$(BUILDPYTHON) -E' |