mirror of
https://git.yoctoproject.org/poky
synced 2026-02-06 00:38:45 +01:00
cb02ecb507
- Based on Paul Eggletons work to partially upgrade to Python 2.7.6 Modified: default-versions.inc: switched to python 2.7.9 generate-manifest-2.7.py: fixed _sysconfigdata python-2.7-manifest.inc: fixed _sysconfigdata python.inc: Updated checksums and source, no LICENSE change just updated some dates python-native_2.7.3 -> python-native_2.7.9 and updated patches python_2.7.3 -> python_2.7.9, and added ac_cv_file__dev_ptmx=no ac_cv_file__dev_ptc=no in EXTRA_OECONF to solve python issue #3754, only needed when cross compiling, also updated patches use_sysroot_ncurses_instead_of_host.patch: New patch to use ncursesw from sysroot instead of hosts, introduced by fix for python issue #15268 Rebased: 01-use-proper-tools-for-cross-build.patch 03-fix-tkinter-detection.patch 05-enable-ctypes-cross-build.patch 06-avoid_usr_lib_termcap_path_in_linking.patch avoid_warning_about_tkinter.patch builddir.patch fix_for_using_different_libdir.patch host_include_contamination.patch multilib.patch nohostlibs.patch search_db_h_in_inc_dirs_and_avoid_warning.patch Deleted (fixed on upstream): 06-ctypes-libffi-fix-configure.patch CVE-2013-4073_py27.patch gcc-4.8-fix-configure-Wformat.patch json-flaw-fix.patch posix_close.patch pypirc-secure.patch python-2.7.3-CVE-2012-2135.patch python-2.7.3-CVE-2013-1752-smtplib-fix.patch python-2.7.3-CVE-2014-1912.patch python-2.7.3-CVE-2014-7185.patch python-2.7.3-berkeley-db-5.3.patch python-fix-build-error-with-Readline-6.3.patch remove-BOM-insection-code.patch remove_sqlite_rpath.patch python2.7.3-nossl3.patch [YOCTO #7059] (From OE-Core rev: d4ad95f0d5f08891637c644e85b09da9c4585059) Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
47 lines
1.8 KiB
Diff
47 lines
1.8 KiB
Diff
When cross compiling python, we used to need to install the Makefile, pyconfig.h
|
|
and the python library to their final location before being able to compile the
|
|
rest of python. This change allows us to point python at its own source when
|
|
building, avoiding a variety of sysroot staging issues and simplifying the main
|
|
python recipe.
|
|
|
|
Upstream-Status: Inappropriate
|
|
RP 2012/11/13
|
|
|
|
Index: Python-2.7.9/Lib/sysconfig.py
|
|
===================================================================
|
|
--- Python-2.7.9.orig/Lib/sysconfig.py
|
|
+++ Python-2.7.9/Lib/sysconfig.py
|
|
@@ -93,6 +93,7 @@ _PREFIX = os.path.normpath(sys.prefix)
|
|
_EXEC_PREFIX = os.path.normpath(sys.exec_prefix)
|
|
_CONFIG_VARS = None
|
|
_USER_BASE = None
|
|
+_PYTHONBUILDDIR = os.environ.get("PYTHONBUILDDIR", None)
|
|
|
|
def _safe_realpath(path):
|
|
try:
|
|
@@ -100,7 +101,9 @@ def _safe_realpath(path):
|
|
except OSError:
|
|
return path
|
|
|
|
-if sys.executable:
|
|
+if _PYTHONBUILDDIR:
|
|
+ _PROJECT_BASE = _PYTHONBUILDDIR
|
|
+elif sys.executable:
|
|
_PROJECT_BASE = os.path.dirname(_safe_realpath(sys.executable))
|
|
else:
|
|
# sys.executable can be empty if argv[0] has been changed and Python is
|
|
Index: Python-2.7.9/Lib/distutils/sysconfig.py
|
|
===================================================================
|
|
--- Python-2.7.9.orig/Lib/distutils/sysconfig.py
|
|
+++ Python-2.7.9/Lib/distutils/sysconfig.py
|
|
@@ -26,6 +26,9 @@ EXEC_PREFIX = os.path.normpath(sys.exec_
|
|
# live in project/PCBuild9. If we're dealing with an x64 Windows build,
|
|
# it'll live in project/PCbuild/amd64.
|
|
project_base = os.path.dirname(os.path.abspath(sys.executable))
|
|
+_PYTHONBUILDDIR = os.environ.get("PYTHONBUILDDIR", None)
|
|
+if _PYTHONBUILDDIR:
|
|
+ project_base = _PYTHONBUILDDIR
|
|
if os.name == "nt" and "pcbuild" in project_base[-8:].lower():
|
|
project_base = os.path.abspath(os.path.join(project_base, os.path.pardir))
|
|
# PC/VS7.1
|