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/030-fixup-include-dirs.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/030-fixup-include-dirs.patch')
| -rw-r--r-- | meta/recipes-devtools/python/python3/030-fixup-include-dirs.patch | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/meta/recipes-devtools/python/python3/030-fixup-include-dirs.patch b/meta/recipes-devtools/python/python3/030-fixup-include-dirs.patch deleted file mode 100644 index 6beac7b805..0000000000 --- a/meta/recipes-devtools/python/python3/030-fixup-include-dirs.patch +++ /dev/null | |||
| @@ -1,33 +0,0 @@ | |||
| 1 | Do not hardcode /usr into include paths when cross compiling | ||
| 2 | |||
| 3 | -Khem | ||
| 4 | |||
| 5 | Upstream-Status: Pending | ||
| 6 | |||
| 7 | --- | ||
| 8 | setup.py | 15 ++------------- | ||
| 9 | 1 file changed, 2 insertions(+), 13 deletions(-) | ||
| 10 | |||
| 11 | Index: Python-3.3.2/setup.py | ||
| 12 | =================================================================== | ||
| 13 | --- Python-3.3.2.orig/setup.py | ||
| 14 | +++ Python-3.3.2/setup.py | ||
| 15 | @@ -444,7 +444,8 @@ class PyBuildExt(build_ext): | ||
| 16 | # only change this for cross builds for 3.3, issues on Mageia | ||
| 17 | if cross_compiling: | ||
| 18 | self.add_gcc_paths() | ||
| 19 | - self.add_multiarch_paths() | ||
| 20 | + if not cross_compiling: | ||
| 21 | + self.add_multiarch_paths() | ||
| 22 | |||
| 23 | # Add paths specified in the environment variables LDFLAGS and | ||
| 24 | # CPPFLAGS for header and library files. | ||
| 25 | @@ -480,7 +481,7 @@ class PyBuildExt(build_ext): | ||
| 26 | for directory in reversed(options.dirs): | ||
| 27 | add_dir_to_list(dir_list, directory) | ||
| 28 | |||
| 29 | - if os.path.normpath(sys.base_prefix) != '/usr' \ | ||
| 30 | + if not cross_compiling and os.path.normpath(sys.base_prefix) != '/usr' \ | ||
| 31 | and not sysconfig.get_config_var('PYTHONFRAMEWORK'): | ||
| 32 | # OSX note: Don't add LIBDIR and INCLUDEDIR to building a framework | ||
| 33 | # (PYTHONFRAMEWORK is set) to avoid # linking problems when | ||
