diff options
author | Dominic Sacré <dominic.sacre@gmx.de> | 2015-07-28 16:58:38 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-08-01 22:24:18 +0100 |
commit | 10196e346579fb443e63b57d61393a11c319b9a5 (patch) | |
tree | ed6d5e21f8f09af0c992e69cd48ad8aeb29ee168 /meta/recipes-devtools/python | |
parent | b5e9dbbe8245f47d2d3d77f219a2d30a48e1918b (diff) | |
download | poky-10196e346579fb443e63b57d61393a11c319b9a5.tar.gz |
python3: delete patches that don't get applied anywhere
These patches are not referenced in any of the Python recipes.
(From OE-Core rev: 05d18a1d2630fbe81d8218c3722481d31bf0892f)
Signed-off-by: Dominic Sacré <dominic.sacre@gmx.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/python')
5 files changed, 0 insertions, 179 deletions
diff --git a/meta/recipes-devtools/python/python3/06-ctypes-libffi-fix-configure.patch b/meta/recipes-devtools/python/python3/06-ctypes-libffi-fix-configure.patch deleted file mode 100644 index abd63d2a96..0000000000 --- a/meta/recipes-devtools/python/python3/06-ctypes-libffi-fix-configure.patch +++ /dev/null | |||
@@ -1,44 +0,0 @@ | |||
1 | This fixes configure issues with recent autoconf, e.g: | ||
2 | autoreconf: Entering directory `Modules/_ctypes/libffi' | ||
3 | autoreconf: configure.ac: not using Gettext | ||
4 | autoreconf: running: aclocal --force | ||
5 | configure.ac:26: error: m4_copy: won't overwrite defined macro: _AC_ARG_VAR_PRECIOUS | ||
6 | configure.ac:26: the top level | ||
7 | |||
8 | The problem is still present in python-2.6.5 but fixed in python-svn. | ||
9 | |||
10 | Upstream-Status: Accepted [python-svn] | ||
11 | |||
12 | Signed-off-by: Antonio Ospite <ospite@studenti.unina.it> | ||
13 | Acked-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
14 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
15 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | ||
16 | |||
17 | |||
18 | 2011/09/29 | ||
19 | Rebased for python 2.7.2 | ||
20 | Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> | ||
21 | |||
22 | |||
23 | Index: Python-2.7.2/Modules/_ctypes/libffi/Makefile.am | ||
24 | =================================================================== | ||
25 | --- Python-2.7.2.orig/Modules/_ctypes/libffi/Makefile.am | ||
26 | +++ Python-2.7.2/Modules/_ctypes/libffi/Makefile.am | ||
27 | @@ -2,7 +2,7 @@ | ||
28 | |||
29 | AUTOMAKE_OPTIONS = foreign subdir-objects | ||
30 | |||
31 | -SUBDIRS = include testsuite man | ||
32 | +SUBDIRS = include | ||
33 | |||
34 | EXTRA_DIST = LICENSE ChangeLog.v1 ChangeLog.libgcj configure.host \ | ||
35 | src/alpha/ffi.c src/alpha/osf.S src/alpha/ffitarget.h \ | ||
36 | @@ -34,8 +34,6 @@ EXTRA_DIST = LICENSE ChangeLog.v1 Change | ||
37 | libtool-version ChangeLog.libffi m4/libtool.m4 \ | ||
38 | m4/lt~obsolete.m4 m4/ltoptions.m4 m4/ltsugar.m4 m4/ltversion.m4 | ||
39 | |||
40 | -info_TEXINFOS = doc/libffi.texi | ||
41 | - | ||
42 | ## ################################################################ | ||
43 | |||
44 | ## | ||
diff --git a/meta/recipes-devtools/python/python3/fix-ast.h-dependency.patch b/meta/recipes-devtools/python/python3/fix-ast.h-dependency.patch deleted file mode 100644 index 77c220aa82..0000000000 --- a/meta/recipes-devtools/python/python3/fix-ast.h-dependency.patch +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | Fix a missed dependency on ast.h which can result in race condition | ||
2 | at high parallel build | ||
3 | |||
4 | It fixed here | ||
5 | |||
6 | http://hg.python.org/cpython/rev/cfe0a293551f | ||
7 | |||
8 | [YOCTO #5884] | ||
9 | |||
10 | Upstream-Status: Backport | ||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | |||
13 | Index: Python-3.3.3/Makefile.pre.in | ||
14 | =================================================================== | ||
15 | --- Python-3.3.3.orig/Makefile.pre.in 2014-02-26 09:33:13.868288863 -0800 | ||
16 | +++ Python-3.3.3/Makefile.pre.in 2014-02-26 09:36:27.348292492 -0800 | ||
17 | @@ -853,7 +853,8 @@ | ||
18 | $(srcdir)/Include/warnings.h \ | ||
19 | $(srcdir)/Include/weakrefobject.h \ | ||
20 | pyconfig.h \ | ||
21 | - $(PARSER_HEADERS) | ||
22 | + $(PARSER_HEADERS) \ | ||
23 | + $(AST_H) | ||
24 | |||
25 | $(LIBRARY_OBJS) $(MODOBJS) Modules/python.o: $(PYTHON_HEADERS) | ||
26 | |||
diff --git a/meta/recipes-devtools/python/python3/pip_build_directory_unclean.patch b/meta/recipes-devtools/python/python3/pip_build_directory_unclean.patch deleted file mode 100644 index c0c4617d59..0000000000 --- a/meta/recipes-devtools/python/python3/pip_build_directory_unclean.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | Index: Python-3.4.2/Lib/ensurepip/__init__.py | ||
2 | =================================================================== | ||
3 | --- Python-3.4.2.orig/Lib/ensurepip/__init__.py | ||
4 | +++ Python-3.4.2/Lib/ensurepip/__init__.py | ||
5 | @@ -3,6 +3,7 @@ import os.path | ||
6 | import pkgutil | ||
7 | import sys | ||
8 | import tempfile | ||
9 | +import pwd | ||
10 | |||
11 | |||
12 | __all__ = ["version", "bootstrap"] | ||
13 | @@ -36,6 +37,15 @@ def _run_pip(args, additional_paths=None | ||
14 | if additional_paths is not None: | ||
15 | sys.path = additional_paths + sys.path | ||
16 | |||
17 | + # Explicitly make sure pip build directory was left clean | ||
18 | + user = pwd.getpwuid(os.getuid())[0] | ||
19 | + if os.path.exists("/tmp/pip_build_" + user + "/pip-delete-this-directory.txt"): | ||
20 | + os.remove("/tmp/pip_build_" + user + "/pip-delete-this-directory.txt") | ||
21 | + try: | ||
22 | + os.rmdir("/tmp/pip_build_" + user + "/") | ||
23 | + except OSError: | ||
24 | + print("Error: Pip build directory (%s) was left unclean, make sure it is clean before continuing\n" % ("/tmp/pip_build_" + user + "/")) | ||
25 | + | ||
26 | # Install the bundled software | ||
27 | import pip | ||
28 | pip.main(args) | ||
diff --git a/meta/recipes-devtools/python/python3/python3-fix-build-error-with-Readline-6.3.patch b/meta/recipes-devtools/python/python3/python3-fix-build-error-with-Readline-6.3.patch deleted file mode 100644 index 44e2b7e5f1..0000000000 --- a/meta/recipes-devtools/python/python3/python3-fix-build-error-with-Readline-6.3.patch +++ /dev/null | |||
@@ -1,62 +0,0 @@ | |||
1 | python3: fix build error with Readline 6.3 | ||
2 | |||
3 | Backport two patches from upstream: | ||
4 | |||
5 | use new readline function types (closes #20374) | ||
6 | Issue #20374: Avoid compiler warnings when compiling readline with libedit. | ||
7 | |||
8 | Upstream-Status: Backport | ||
9 | |||
10 | Signed-off-by: Chong Lu <Chong.Lu@windriver.com> | ||
11 | --- | ||
12 | Modules/readline.c | 15 ++++++++++++--- | ||
13 | 1 file changed, 12 insertions(+), 3 deletions(-) | ||
14 | |||
15 | diff --git a/Modules/readline.c b/Modules/readline.c | ||
16 | index 096c6d1..1646ef8 100644 | ||
17 | --- a/Modules/readline.c | ||
18 | +++ b/Modules/readline.c | ||
19 | @@ -773,15 +773,24 @@ on_hook(PyObject *func) | ||
20 | return result; | ||
21 | } | ||
22 | |||
23 | + | ||
24 | static int | ||
25 | +#if defined(_RL_FUNCTION_TYPEDEF) | ||
26 | on_startup_hook(void) | ||
27 | +#else | ||
28 | +on_startup_hook() | ||
29 | +#endif | ||
30 | { | ||
31 | return on_hook(startup_hook); | ||
32 | } | ||
33 | |||
34 | #ifdef HAVE_RL_PRE_INPUT_HOOK | ||
35 | static int | ||
36 | +#if defined(_RL_FUNCTION_TYPEDEF) | ||
37 | on_pre_input_hook(void) | ||
38 | +#else | ||
39 | +on_pre_input_hook() | ||
40 | +#endif | ||
41 | { | ||
42 | return on_hook(pre_input_hook); | ||
43 | } | ||
44 | @@ -936,12 +945,12 @@ setup_readline(void) | ||
45 | rl_bind_key_in_map ('\t', rl_complete, emacs_meta_keymap); | ||
46 | rl_bind_key_in_map ('\033', rl_complete, emacs_meta_keymap); | ||
47 | /* Set our hook functions */ | ||
48 | - rl_startup_hook = (Function *)on_startup_hook; | ||
49 | + rl_startup_hook = (rl_hook_func_t *)on_startup_hook; | ||
50 | #ifdef HAVE_RL_PRE_INPUT_HOOK | ||
51 | - rl_pre_input_hook = (Function *)on_pre_input_hook; | ||
52 | + rl_pre_input_hook = (rl_hook_func_t *)on_pre_input_hook; | ||
53 | #endif | ||
54 | /* Set our completion function */ | ||
55 | - rl_attempted_completion_function = (CPPFunction *)flex_complete; | ||
56 | + rl_attempted_completion_function = (rl_completion_func_t *)flex_complete; | ||
57 | /* Set Python word break characters */ | ||
58 | completer_word_break_characters = | ||
59 | rl_completer_word_break_characters = | ||
60 | -- | ||
61 | 1.7.9.5 | ||
62 | |||
diff --git a/meta/recipes-devtools/python/python3/remove_sqlite_rpath.patch b/meta/recipes-devtools/python/python3/remove_sqlite_rpath.patch deleted file mode 100644 index 4ec627ea51..0000000000 --- a/meta/recipes-devtools/python/python3/remove_sqlite_rpath.patch +++ /dev/null | |||
@@ -1,19 +0,0 @@ | |||
1 | This patch removes the RPATH setting which contains a pointer to | ||
2 | the target relocated sysroot, which is incorrect. | ||
3 | |||
4 | Upstream-Status: Inappropriate [Embedded Specific] | ||
5 | |||
6 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | ||
7 | |||
8 | Index: Python-2.6.6/setup.py | ||
9 | =================================================================== | ||
10 | --- Python-2.6.6.orig/setup.py 2011-09-28 14:22:57.000000000 -0700 | ||
11 | +++ Python-2.6.6/setup.py 2011-09-28 16:11:25.147279633 -0700 | ||
12 | @@ -1079,7 +1079,6 @@ | ||
13 | include_dirs=["Modules/_sqlite", | ||
14 | sqlite_incdir], | ||
15 | library_dirs=sqlite_libdir, | ||
16 | - runtime_library_dirs=sqlite_libdir, | ||
17 | extra_link_args=sqlite_extra_link_args, | ||
18 | libraries=["sqlite3",])) | ||
19 | else: | ||