From b996f22f8bed0c587392e33cc58c4b9c673ad50e Mon Sep 17 00:00:00 2001 From: Chong Lu Date: Thu, 3 Apr 2014 07:52:22 +0000 Subject: python: 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. [YOCTO #6107] (From OE-Core rev: a6b91ae7dec2edebc0eaea0592c42b1c455ad4d7) Signed-off-by: Chong Lu Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../recipes-devtools/python/python-native_2.7.3.bb | 1 + .../python-fix-build-error-with-Readline-6.3.patch | 62 ++++++++++++++++++++++ .../python/python3-native_3.3.3.bb | 1 + ...python3-fix-build-error-with-Readline-6.3.patch | 62 ++++++++++++++++++++++ meta/recipes-devtools/python/python3_3.3.3.bb | 1 + meta/recipes-devtools/python/python_2.7.3.bb | 1 + 6 files changed, 128 insertions(+) create mode 100644 meta/recipes-devtools/python/python/python-fix-build-error-with-Readline-6.3.patch create mode 100644 meta/recipes-devtools/python/python3/python3-fix-build-error-with-Readline-6.3.patch (limited to 'meta/recipes-devtools/python') diff --git a/meta/recipes-devtools/python/python-native_2.7.3.bb b/meta/recipes-devtools/python/python-native_2.7.3.bb index 6b87a16d41..0c66d27c2d 100644 --- a/meta/recipes-devtools/python/python-native_2.7.3.bb +++ b/meta/recipes-devtools/python/python-native_2.7.3.bb @@ -17,6 +17,7 @@ SRC_URI += "\ file://add-md5module-support.patch \ file://builddir.patch \ file://parallel-makeinst-create-bindir.patch \ + file://python-fix-build-error-with-Readline-6.3.patch \ " S = "${WORKDIR}/Python-${PV}" diff --git a/meta/recipes-devtools/python/python/python-fix-build-error-with-Readline-6.3.patch b/meta/recipes-devtools/python/python/python-fix-build-error-with-Readline-6.3.patch new file mode 100644 index 0000000000..b84f8c3461 --- /dev/null +++ b/meta/recipes-devtools/python/python/python-fix-build-error-with-Readline-6.3.patch @@ -0,0 +1,62 @@ +python: 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 +--- + Modules/readline.c | 15 ++++++++++++--- + 1 file changed, 12 insertions(+), 3 deletions(-) + +diff --git a/Modules/readline.c b/Modules/readline.c +index b5e258d..d3f52aa 100644 +--- a/Modules/readline.c ++++ b/Modules/readline.c +@@ -735,15 +735,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); + } +@@ -886,12 +895,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 */ + rl_completer_word_break_characters = + strdup(" \t\n`~!@#$%^&*()-=+[{]}\\|;:'\",<>/?"); +-- +1.7.9.5 + diff --git a/meta/recipes-devtools/python/python3-native_3.3.3.bb b/meta/recipes-devtools/python/python3-native_3.3.3.bb index df8f28b3d9..7238eaf27d 100644 --- a/meta/recipes-devtools/python/python3-native_3.3.3.bb +++ b/meta/recipes-devtools/python/python3-native_3.3.3.bb @@ -25,6 +25,7 @@ file://unixccompiler.patch \ file://fix-ast.h-dependency.patch \ file://makerace.patch \ ${DISTRO_SRC_URI} \ +file://python3-fix-build-error-with-Readline-6.3.patch \ " SRC_URI[md5sum] = "f3ebe34d4d8695bf889279b54673e10c" SRC_URI[sha256sum] = "e526e9b612f623888364d30cc9f3dfc34dcef39065c713bdbcddf47df84d8dcb" 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 new file mode 100644 index 0000000000..44e2b7e5f1 --- /dev/null +++ b/meta/recipes-devtools/python/python3/python3-fix-build-error-with-Readline-6.3.patch @@ -0,0 +1,62 @@ +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 +--- + 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 + diff --git a/meta/recipes-devtools/python/python3_3.3.3.bb b/meta/recipes-devtools/python/python3_3.3.3.bb index b6f6def8f1..c357bbb07e 100644 --- a/meta/recipes-devtools/python/python3_3.3.3.bb +++ b/meta/recipes-devtools/python/python3_3.3.3.bb @@ -20,6 +20,7 @@ file://0001-h2py-Fix-issue-13032-where-it-fails-with-UnicodeDeco.patch \ file://fix-ast.h-dependency.patch \ file://makerace.patch \ ${DISTRO_SRC_URI} \ +file://python3-fix-build-error-with-Readline-6.3.patch \ " SRC_URI += "\ diff --git a/meta/recipes-devtools/python/python_2.7.3.bb b/meta/recipes-devtools/python/python_2.7.3.bb index aaa72e5e10..c7bb9b4131 100644 --- a/meta/recipes-devtools/python/python_2.7.3.bb +++ b/meta/recipes-devtools/python/python_2.7.3.bb @@ -34,6 +34,7 @@ SRC_URI += "\ file://pypirc-secure.patch \ file://parallel-makeinst-create-bindir.patch \ file://python-2.7.3-CVE-2013-1752-smtplib-fix.patch \ + file://python-fix-build-error-with-Readline-6.3.patch \ " S = "${WORKDIR}/Python-${PV}" -- cgit v1.2.3-54-g00ecf