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>
This commit is contained in:
Dominic Sacré
Richard Purdie
parent
b5e9dbbe82
commit
10196e3465
|
|
@ -1,44 +0,0 @@
|
|||
This fixes configure issues with recent autoconf, e.g:
|
||||
autoreconf: Entering directory `Modules/_ctypes/libffi'
|
||||
autoreconf: configure.ac: not using Gettext
|
||||
autoreconf: running: aclocal --force
|
||||
configure.ac:26: error: m4_copy: won't overwrite defined macro: _AC_ARG_VAR_PRECIOUS
|
||||
configure.ac:26: the top level
|
||||
|
||||
The problem is still present in python-2.6.5 but fixed in python-svn.
|
||||
|
||||
Upstream-Status: Accepted [python-svn]
|
||||
|
||||
Signed-off-by: Antonio Ospite <ospite@studenti.unina.it>
|
||||
Acked-by: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
Signed-off-by: Saul Wold <sgw@linux.intel.com>
|
||||
|
||||
|
||||
2011/09/29
|
||||
Rebased for python 2.7.2
|
||||
Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
|
||||
|
||||
|
||||
Index: Python-2.7.2/Modules/_ctypes/libffi/Makefile.am
|
||||
===================================================================
|
||||
--- Python-2.7.2.orig/Modules/_ctypes/libffi/Makefile.am
|
||||
+++ Python-2.7.2/Modules/_ctypes/libffi/Makefile.am
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
AUTOMAKE_OPTIONS = foreign subdir-objects
|
||||
|
||||
-SUBDIRS = include testsuite man
|
||||
+SUBDIRS = include
|
||||
|
||||
EXTRA_DIST = LICENSE ChangeLog.v1 ChangeLog.libgcj configure.host \
|
||||
src/alpha/ffi.c src/alpha/osf.S src/alpha/ffitarget.h \
|
||||
@@ -34,8 +34,6 @@ EXTRA_DIST = LICENSE ChangeLog.v1 Change
|
||||
libtool-version ChangeLog.libffi m4/libtool.m4 \
|
||||
m4/lt~obsolete.m4 m4/ltoptions.m4 m4/ltsugar.m4 m4/ltversion.m4
|
||||
|
||||
-info_TEXINFOS = doc/libffi.texi
|
||||
-
|
||||
## ################################################################
|
||||
|
||||
##
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
Fix a missed dependency on ast.h which can result in race condition
|
||||
at high parallel build
|
||||
|
||||
It fixed here
|
||||
|
||||
http://hg.python.org/cpython/rev/cfe0a293551f
|
||||
|
||||
[YOCTO #5884]
|
||||
|
||||
Upstream-Status: Backport
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
|
||||
Index: Python-3.3.3/Makefile.pre.in
|
||||
===================================================================
|
||||
--- Python-3.3.3.orig/Makefile.pre.in 2014-02-26 09:33:13.868288863 -0800
|
||||
+++ Python-3.3.3/Makefile.pre.in 2014-02-26 09:36:27.348292492 -0800
|
||||
@@ -853,7 +853,8 @@
|
||||
$(srcdir)/Include/warnings.h \
|
||||
$(srcdir)/Include/weakrefobject.h \
|
||||
pyconfig.h \
|
||||
- $(PARSER_HEADERS)
|
||||
+ $(PARSER_HEADERS) \
|
||||
+ $(AST_H)
|
||||
|
||||
$(LIBRARY_OBJS) $(MODOBJS) Modules/python.o: $(PYTHON_HEADERS)
|
||||
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
Index: Python-3.4.2/Lib/ensurepip/__init__.py
|
||||
===================================================================
|
||||
--- Python-3.4.2.orig/Lib/ensurepip/__init__.py
|
||||
+++ Python-3.4.2/Lib/ensurepip/__init__.py
|
||||
@@ -3,6 +3,7 @@ import os.path
|
||||
import pkgutil
|
||||
import sys
|
||||
import tempfile
|
||||
+import pwd
|
||||
|
||||
|
||||
__all__ = ["version", "bootstrap"]
|
||||
@@ -36,6 +37,15 @@ def _run_pip(args, additional_paths=None
|
||||
if additional_paths is not None:
|
||||
sys.path = additional_paths + sys.path
|
||||
|
||||
+ # Explicitly make sure pip build directory was left clean
|
||||
+ user = pwd.getpwuid(os.getuid())[0]
|
||||
+ if os.path.exists("/tmp/pip_build_" + user + "/pip-delete-this-directory.txt"):
|
||||
+ os.remove("/tmp/pip_build_" + user + "/pip-delete-this-directory.txt")
|
||||
+ try:
|
||||
+ os.rmdir("/tmp/pip_build_" + user + "/")
|
||||
+ except OSError:
|
||||
+ print("Error: Pip build directory (%s) was left unclean, make sure it is clean before continuing\n" % ("/tmp/pip_build_" + user + "/"))
|
||||
+
|
||||
# Install the bundled software
|
||||
import pip
|
||||
pip.main(args)
|
||||
|
|
@ -1,62 +0,0 @@
|
|||
python3: fix build error with Readline 6.3
|
||||
|
||||
Backport two patches from upstream:
|
||||
|
||||
use new readline function types (closes #20374)
|
||||
Issue #20374: Avoid compiler warnings when compiling readline with libedit.
|
||||
|
||||
Upstream-Status: Backport
|
||||
|
||||
Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
|
||||
---
|
||||
Modules/readline.c | 15 ++++++++++++---
|
||||
1 file changed, 12 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/Modules/readline.c b/Modules/readline.c
|
||||
index 096c6d1..1646ef8 100644
|
||||
--- a/Modules/readline.c
|
||||
+++ b/Modules/readline.c
|
||||
@@ -773,15 +773,24 @@ on_hook(PyObject *func)
|
||||
return result;
|
||||
}
|
||||
|
||||
+
|
||||
static int
|
||||
+#if defined(_RL_FUNCTION_TYPEDEF)
|
||||
on_startup_hook(void)
|
||||
+#else
|
||||
+on_startup_hook()
|
||||
+#endif
|
||||
{
|
||||
return on_hook(startup_hook);
|
||||
}
|
||||
|
||||
#ifdef HAVE_RL_PRE_INPUT_HOOK
|
||||
static int
|
||||
+#if defined(_RL_FUNCTION_TYPEDEF)
|
||||
on_pre_input_hook(void)
|
||||
+#else
|
||||
+on_pre_input_hook()
|
||||
+#endif
|
||||
{
|
||||
return on_hook(pre_input_hook);
|
||||
}
|
||||
@@ -936,12 +945,12 @@ setup_readline(void)
|
||||
rl_bind_key_in_map ('\t', rl_complete, emacs_meta_keymap);
|
||||
rl_bind_key_in_map ('\033', rl_complete, emacs_meta_keymap);
|
||||
/* Set our hook functions */
|
||||
- rl_startup_hook = (Function *)on_startup_hook;
|
||||
+ rl_startup_hook = (rl_hook_func_t *)on_startup_hook;
|
||||
#ifdef HAVE_RL_PRE_INPUT_HOOK
|
||||
- rl_pre_input_hook = (Function *)on_pre_input_hook;
|
||||
+ rl_pre_input_hook = (rl_hook_func_t *)on_pre_input_hook;
|
||||
#endif
|
||||
/* Set our completion function */
|
||||
- rl_attempted_completion_function = (CPPFunction *)flex_complete;
|
||||
+ rl_attempted_completion_function = (rl_completion_func_t *)flex_complete;
|
||||
/* Set Python word break characters */
|
||||
completer_word_break_characters =
|
||||
rl_completer_word_break_characters =
|
||||
--
|
||||
1.7.9.5
|
||||
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
This patch removes the RPATH setting which contains a pointer to
|
||||
the target relocated sysroot, which is incorrect.
|
||||
|
||||
Upstream-Status: Inappropriate [Embedded Specific]
|
||||
|
||||
Signed-off-by: Saul Wold <sgw@linux.intel.com>
|
||||
|
||||
Index: Python-2.6.6/setup.py
|
||||
===================================================================
|
||||
--- Python-2.6.6.orig/setup.py 2011-09-28 14:22:57.000000000 -0700
|
||||
+++ Python-2.6.6/setup.py 2011-09-28 16:11:25.147279633 -0700
|
||||
@@ -1079,7 +1079,6 @@
|
||||
include_dirs=["Modules/_sqlite",
|
||||
sqlite_incdir],
|
||||
library_dirs=sqlite_libdir,
|
||||
- runtime_library_dirs=sqlite_libdir,
|
||||
extra_link_args=sqlite_extra_link_args,
|
||||
libraries=["sqlite3",]))
|
||||
else:
|
||||
Loading…
Reference in New Issue