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/130-readline-setup.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/130-readline-setup.patch')
-rw-r--r-- | meta/recipes-devtools/python/python3/130-readline-setup.patch | 55 |
1 files changed, 0 insertions, 55 deletions
diff --git a/meta/recipes-devtools/python/python3/130-readline-setup.patch b/meta/recipes-devtools/python/python3/130-readline-setup.patch deleted file mode 100644 index cfa712678b..0000000000 --- a/meta/recipes-devtools/python/python3/130-readline-setup.patch +++ /dev/null | |||
@@ -1,55 +0,0 @@ | |||
1 | package python-readline | ||
2 | |||
3 | -Khem | ||
4 | |||
5 | Upstream-Status: Inappropriate [Embedded Specific] | ||
6 | |||
7 | --- a/setup.py | ||
8 | +++ b/setup.py | ||
9 | @@ -666,45 +666,7 @@ class PyBuildExt(build_ext): | ||
10 | # readline | ||
11 | do_readline = self.compiler.find_library_file(lib_dirs, 'readline') | ||
12 | readline_termcap_library = "" | ||
13 | - curses_library = "" | ||
14 | - # Cannot use os.popen here in py3k. | ||
15 | - tmpfile = os.path.join(self.build_temp, 'readline_termcap_lib') | ||
16 | - if not os.path.exists(self.build_temp): | ||
17 | - os.makedirs(self.build_temp) | ||
18 | - # Determine if readline is already linked against curses or tinfo. | ||
19 | - if do_readline: | ||
20 | - if cross_compiling: | ||
21 | - ret = os.system("%s -d %s | grep '(NEEDED)' > %s" \ | ||
22 | - % (sysconfig.get_config_var('READELF'), | ||
23 | - do_readline, tmpfile)) | ||
24 | - elif find_executable('ldd'): | ||
25 | - ret = os.system("ldd %s > %s" % (do_readline, tmpfile)) | ||
26 | - else: | ||
27 | - ret = 256 | ||
28 | - if ret >> 8 == 0: | ||
29 | - with open(tmpfile) as fp: | ||
30 | - for ln in fp: | ||
31 | - if 'curses' in ln: | ||
32 | - readline_termcap_library = re.sub( | ||
33 | - r'.*lib(n?cursesw?)\.so.*', r'\1', ln | ||
34 | - ).rstrip() | ||
35 | - break | ||
36 | - # termcap interface split out from ncurses | ||
37 | - if 'tinfo' in ln: | ||
38 | - readline_termcap_library = 'tinfo' | ||
39 | - break | ||
40 | - if os.path.exists(tmpfile): | ||
41 | - os.unlink(tmpfile) | ||
42 | - # Issue 7384: If readline is already linked against curses, | ||
43 | - # use the same library for the readline and curses modules. | ||
44 | - if 'curses' in readline_termcap_library: | ||
45 | - curses_library = readline_termcap_library | ||
46 | - elif self.compiler.find_library_file(lib_dirs, 'ncursesw'): | ||
47 | - curses_library = 'ncursesw' | ||
48 | - elif self.compiler.find_library_file(lib_dirs, 'ncurses'): | ||
49 | - curses_library = 'ncurses' | ||
50 | - elif self.compiler.find_library_file(lib_dirs, 'curses'): | ||
51 | - curses_library = 'curses' | ||
52 | + curses_library = "ncursesw" | ||
53 | |||
54 | if host_platform == 'darwin': | ||
55 | os_release = int(os.uname()[2].split('.')[0]) | ||