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/03-fix-tkinter-detection.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/03-fix-tkinter-detection.patch')
-rw-r--r-- | meta/recipes-devtools/python/python3/03-fix-tkinter-detection.patch | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/meta/recipes-devtools/python/python3/03-fix-tkinter-detection.patch b/meta/recipes-devtools/python/python3/03-fix-tkinter-detection.patch deleted file mode 100644 index fddfd2b2f6..0000000000 --- a/meta/recipes-devtools/python/python3/03-fix-tkinter-detection.patch +++ /dev/null | |||
@@ -1,42 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [embedded specific] | ||
2 | |||
3 | # We need to supply STAGING_INCDIR here, otherwise the Tk headers | ||
4 | # will not be found. | ||
5 | # Signed-Off: Michael 'Mickey' Lauer <mickey@vanille.de> | ||
6 | |||
7 | Index: Python-3.3.0rc2/setup.py | ||
8 | =================================================================== | ||
9 | --- Python-3.3.0rc2.orig/setup.py 2012-09-20 15:24:14.009124003 -0700 | ||
10 | +++ Python-3.3.0rc2/setup.py 2012-09-20 15:25:08.449124963 -0700 | ||
11 | @@ -1620,7 +1620,7 @@ | ||
12 | dotversion = dotversion[:-1] + '.' + dotversion[-1] | ||
13 | tcl_include_sub = [] | ||
14 | tk_include_sub = [] | ||
15 | - for dir in inc_dirs: | ||
16 | + for dir in [os.getenv("STAGING_INCDIR")]: | ||
17 | tcl_include_sub += [dir + os.sep + "tcl" + dotversion] | ||
18 | tk_include_sub += [dir + os.sep + "tk" + dotversion] | ||
19 | tk_include_sub += tcl_include_sub | ||
20 | @@ -1639,22 +1639,6 @@ | ||
21 | if dir not in include_dirs: | ||
22 | include_dirs.append(dir) | ||
23 | |||
24 | - # Check for various platform-specific directories | ||
25 | - if host_platform == 'sunos5': | ||
26 | - include_dirs.append('/usr/openwin/include') | ||
27 | - added_lib_dirs.append('/usr/openwin/lib') | ||
28 | - elif os.path.exists('/usr/X11R6/include'): | ||
29 | - include_dirs.append('/usr/X11R6/include') | ||
30 | - added_lib_dirs.append('/usr/X11R6/lib64') | ||
31 | - added_lib_dirs.append('/usr/X11R6/lib') | ||
32 | - elif os.path.exists('/usr/X11R5/include'): | ||
33 | - include_dirs.append('/usr/X11R5/include') | ||
34 | - added_lib_dirs.append('/usr/X11R5/lib') | ||
35 | - else: | ||
36 | - # Assume default location for X11 | ||
37 | - include_dirs.append('/usr/X11/include') | ||
38 | - added_lib_dirs.append('/usr/X11/lib') | ||
39 | - | ||
40 | # If Cygwin, then verify that X is installed before proceeding | ||
41 | if host_platform == 'cygwin': | ||
42 | x11_inc = find_file('X11/Xlib.h', [], include_dirs) | ||