diff options
| author | Alexander Kanavin <alex.kanavin@gmail.com> | 2019-02-06 17:26:34 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-02-08 10:57:19 +0000 |
| commit | e2c3247c233876ab090c9ce3d5325a6d46ab350f (patch) | |
| tree | cf38957a3510be612cde924f6184a5251b968a43 /meta/recipes-devtools/python/python3/sysconfig.py-add-_PYTHON_PROJECT_SRC.patch | |
| parent | cd6c61a26177296e24b442e2eda1514b5f931c0a (diff) | |
| download | poky-e2c3247c233876ab090c9ce3d5325a6d46ab350f.tar.gz | |
python3: upgrade to 3.7.2
I took the same approach as the recent perl upgrade: write recipe from scratch,
taking the pieces from the old recipe only when they were proven to be necessary.
The pgo, manifest and ptest features are all preserved.
New features:
- native and target recipes are now unified into one recipe
- check_build_completeness.py runs right after do_compile() and verifies that
all optional modules have been built (a notorious source of regressions)
- a new approach to sysconfig.py and distutils/sysconfig.py returning values
appropriate for native or target builds: we copy the configuration file to a
separate folder, add that folder to sys.path (through environment variable
that differs between native and target builds), and point python to the file
through another environment variable.
There were a few other patches where it was difficult to decide if the patch
is still relevant, and how to test that it works correctly; please add those
as-needed by testing the new python.
(From OE-Core rev: 02714c105426b0d687620913c1a7401b386428b6)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/python/python3/sysconfig.py-add-_PYTHON_PROJECT_SRC.patch')
| -rw-r--r-- | meta/recipes-devtools/python/python3/sysconfig.py-add-_PYTHON_PROJECT_SRC.patch | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/meta/recipes-devtools/python/python3/sysconfig.py-add-_PYTHON_PROJECT_SRC.patch b/meta/recipes-devtools/python/python3/sysconfig.py-add-_PYTHON_PROJECT_SRC.patch deleted file mode 100644 index c89d9a3d83..0000000000 --- a/meta/recipes-devtools/python/python3/sysconfig.py-add-_PYTHON_PROJECT_SRC.patch +++ /dev/null | |||
| @@ -1,51 +0,0 @@ | |||
| 1 | From fc93b3cc23b4f9698ae92a42986dbb02b6f19588 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Robert Yang <liezhi.yang@windriver.com> | ||
| 3 | Date: Sun, 18 Jan 2015 06:29:50 -0800 | ||
| 4 | Subject: [PATCH] sysconfig.py: add _PYTHON_PROJECT_SRC | ||
| 5 | |||
| 6 | python3 has introduced _PYTHON_PROJECT_BASE which is used for separate B | ||
| 7 | and S, but it doesn't work when compile Modules, the target python3 runs | ||
| 8 | python3-native's sysconfig to get srcdir which is the native's, there | ||
| 9 | would be errors when native's srcdir has been removed, add | ||
| 10 | _PYTHON_PROJECT_SRC to fix the problem. | ||
| 11 | |||
| 12 | Upstream-Status: Pending | ||
| 13 | |||
| 14 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
| 15 | --- | ||
| 16 | Lib/distutils/sysconfig.py | 5 ++++- | ||
| 17 | Lib/sysconfig.py | 5 ++++- | ||
| 18 | 2 files changed, 8 insertions(+), 2 deletions(-) | ||
| 19 | |||
| 20 | Index: Python-3.5.3/Lib/distutils/sysconfig.py | ||
| 21 | =================================================================== | ||
| 22 | --- Python-3.5.3.orig/Lib/distutils/sysconfig.py | ||
| 23 | +++ Python-3.5.3/Lib/distutils/sysconfig.py | ||
| 24 | @@ -498,7 +498,10 @@ def get_config_vars(*args): | ||
| 25 | _config_vars['SO'] = SO | ||
| 26 | |||
| 27 | # Always convert srcdir to an absolute path | ||
| 28 | - srcdir = _config_vars.get('srcdir', project_base) | ||
| 29 | + if "_PYTHON_PROJECT_SRC" in os.environ: | ||
| 30 | + srcdir = os.path.abspath(os.environ["_PYTHON_PROJECT_SRC"]) | ||
| 31 | + else: | ||
| 32 | + srcdir = _config_vars.get('srcdir', project_base) | ||
| 33 | if os.name == 'posix': | ||
| 34 | if python_build: | ||
| 35 | # If srcdir is a relative path (typically '.' or '..') | ||
| 36 | Index: Python-3.5.3/Lib/sysconfig.py | ||
| 37 | =================================================================== | ||
| 38 | --- Python-3.5.3.orig/Lib/sysconfig.py | ||
| 39 | +++ Python-3.5.3/Lib/sysconfig.py | ||
| 40 | @@ -544,7 +544,10 @@ def get_config_vars(*args): | ||
| 41 | _CONFIG_VARS['userbase'] = _getuserbase() | ||
| 42 | |||
| 43 | # Always convert srcdir to an absolute path | ||
| 44 | - srcdir = _CONFIG_VARS.get('srcdir', _PROJECT_BASE) | ||
| 45 | + if "_PYTHON_PROJECT_SRC" in os.environ: | ||
| 46 | + srcdir = os.path.abspath(os.environ["_PYTHON_PROJECT_SRC"]) | ||
| 47 | + else: | ||
| 48 | + srcdir = _CONFIG_VARS.get('srcdir', _PROJECT_BASE) | ||
| 49 | if os.name == 'posix': | ||
| 50 | if _PYTHON_BUILD: | ||
| 51 | # If srcdir is a relative path (typically '.' or '..') | ||
