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/setup.py-check-cross_compiling-when-get-FLAGS.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/setup.py-check-cross_compiling-when-get-FLAGS.patch')
-rw-r--r-- | meta/recipes-devtools/python/python3/setup.py-check-cross_compiling-when-get-FLAGS.patch | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/meta/recipes-devtools/python/python3/setup.py-check-cross_compiling-when-get-FLAGS.patch b/meta/recipes-devtools/python/python3/setup.py-check-cross_compiling-when-get-FLAGS.patch deleted file mode 100644 index fc2e12dfe5..0000000000 --- a/meta/recipes-devtools/python/python3/setup.py-check-cross_compiling-when-get-FLAGS.patch +++ /dev/null | |||
@@ -1,50 +0,0 @@ | |||
1 | From 8dad810f3a3d073f09ad72e1a3ee0a895eab2ca1 Mon Sep 17 00:00:00 2001 | ||
2 | From: Robert Yang <liezhi.yang@windriver.com> | ||
3 | Date: Sun, 18 Jan 2015 19:05:36 -0800 | ||
4 | Subject: [PATCH] setup.py:check cross_compiling when get FLAGS | ||
5 | |||
6 | Fixed when compile target pythnon3: | ||
7 | gcc -isystem/path/to/sysroots/x86_64-linux/usr/include \ | ||
8 | -L=/path/to/sysroots/x86_64-linux/usr/lib | ||
9 | |||
10 | This is incorrect, the native sysroot should not be used by target | ||
11 | python3. | ||
12 | |||
13 | Upstream-Status: Pending | ||
14 | |||
15 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
16 | --- | ||
17 | setup.py | 10 ++++++++-- | ||
18 | 1 file changed, 8 insertions(+), 2 deletions(-) | ||
19 | |||
20 | diff --git a/setup.py b/setup.py | ||
21 | index e8339cd..83fd31f 100644 | ||
22 | --- a/setup.py | ||
23 | +++ b/setup.py | ||
24 | @@ -238,7 +238,10 @@ class PyBuildExt(build_ext): | ||
25 | # unfortunately, distutils doesn't let us provide separate C and C++ | ||
26 | # compilers | ||
27 | if compiler is not None: | ||
28 | - (ccshared,cflags) = sysconfig.get_config_vars('CCSHARED','CFLAGS') | ||
29 | + if cross_compiling: | ||
30 | + (ccshared,cflags) = (os.environ.get('CCSHARED') or '', os.environ.get('CFLAGS') or '') | ||
31 | + else: | ||
32 | + (ccshared,cflags) = sysconfig.get_config_vars('CCSHARED','CFLAGS') | ||
33 | args['compiler_so'] = compiler + ' ' + ccshared + ' ' + cflags | ||
34 | self.compiler.set_executables(**args) | ||
35 | |||
36 | @@ -457,7 +460,10 @@ class PyBuildExt(build_ext): | ||
37 | ('LDFLAGS', '-R', self.compiler.runtime_library_dirs), | ||
38 | ('LDFLAGS', '-L', self.compiler.library_dirs), | ||
39 | ('CPPFLAGS', '-I', self.compiler.include_dirs)): | ||
40 | - env_val = sysconfig.get_config_var(env_var) | ||
41 | + if cross_compiling: | ||
42 | + env_val = os.environ.get(env_var) | ||
43 | + else: | ||
44 | + env_val = sysconfig.get_config_var(env_var) | ||
45 | if env_val: | ||
46 | # To prevent optparse from raising an exception about any | ||
47 | # options in env_val that it doesn't know about we strip out | ||
48 | -- | ||
49 | 1.7.9.5 | ||
50 | |||