[Buildroot] [PATCH 1/1] python: fix readline extension compilation with readline 6.3

[Buildroot] [PATCH 1/1] python: fix readline extension compilation with readline 6.3

[Ivan Sergeev]

Signed-off-by: Ivan Sergeev <vsergeev@kumunetworks.com>
---
 package/python/python-012-fix-readline-6.3.patch | 34 ++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 package/python/python-012-fix-readline-6.3.patch

diff --git a/package/python/python-012-fix-readline-6.3.patch b/package/python/python-012-fix-readline-6.3.patch
new file mode 100644
index 0000000..97ae45c
--- /dev/null
+++ b/package/python/python-012-fix-readline-6.3.patch
@@ -0,0 +1,34 @@
+fix readline extension compilation against readline 6.3
+
+readline 6.3 removed some typedefs that had been deprecated for some time, but
+Python 2.7.6 still uses them and therefore fails to build the readline
+extension when it is enabled. This issue has been addressed in the Python bug
+tracker here: http://bugs.python.org/issue20374. The patch below is based on
+the readline_func_cast.patch patch uploaded there. Also see
+http://lists.gnu.org/archive/html/bug-readline/2014-03/msg00003.html for more
+information.
+
+This patch should be removed with the next Python 2.7 release, which should
+include the fix.
+
+Signed-off-by: Ivan Sergeev <vsergeev@kumunetworks.com>
+
+diff -purN python-2.7.6.orig/Modules/readline.c python-2.7.6/Modules/readline.c
+--- python-2.7.6.orig/Modules/readline.c	2014-04-16 13:40:17.566874715 -0700
++++ python-2.7.6/Modules/readline.c	2014-04-16 13:37:15.421231983 -0700
+@@ -911,12 +911,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 = on_startup_hook;
+ #ifdef HAVE_RL_PRE_INPUT_HOOK
+-    rl_pre_input_hook = (Function *)on_pre_input_hook;
++    rl_pre_input_hook = on_pre_input_hook;
+ #endif
+     /* Set our completion function */
+-    rl_attempted_completion_function = (CPPFunction *)flex_complete;
++    rl_attempted_completion_function = flex_complete;
+     /* Set Python word break characters */
+     completer_word_break_characters =
+         rl_completer_word_break_characters =
-- 
1.9.2

[Buildroot] [PATCH 1/1] python: fix readline extension compilation with readline 6.3

[Ivan Sergeev]

Symptoms of build failure:

python 2.7.6 Building
...
building 'readline' extension
/home/vsergeev/buildroot/output/host/usr/bin/arm-xilinx-linux-gnueabi-gcc
-fPIC -fno-strict-aliasing -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
-D_FILE_OFFSET_BITS=64 -pipe -march=armv7-a -mcpu=cortex-a9 -mfpu=neon-fp16
-mfloat-abi=softfp -ftree-vectorize -Os -DNDEBUG -g -O3 -Wall
-Wstrict-prototypes -I. -IInclude -I./Include
-I/home/vsergeev/buildroot/output/host/usr/arm-buildroot-linux-gnueabi/sysroot/usr/include
-I/home/vsergeev/buildroot/output/build/python-2.7.6/Include
-I/home/vsergeev/buildroot/output/build/python-2.7.6 -c
/home/vsergeev/buildroot/output/build/python-2.7.6/Modules/readline.c -o
build/temp.linux2-arm-2.7/home/vsergeev/buildroot/output/build/python-2.7.6/Modules/readline.o
/home/vsergeev/buildroot/output/build/python-2.7.6/Modules/readline.c: In
function 'setup_readline':
/home/vsergeev/buildroot/output/build/python-2.7.6/Modules/readline.c:914:24:
error: 'Function' undeclared (first use in this function)
/home/vsergeev/buildroot/output/build/python-2.7.6/Modules/readline.c:914:24:
note: each undeclared identifier is reported only once for each function it
appears in
/home/vsergeev/buildroot/output/build/python-2.7.6/Modules/readline.c:914:34:
error: expected expression before ')' token
/home/vsergeev/buildroot/output/build/python-2.7.6/Modules/readline.c:916:36:
error: expected expression before ')' token
/home/vsergeev/buildroot/output/build/python-2.7.6/Modules/readline.c:919:41:
error: 'CPPFunction' undeclared (first use in this function)
/home/vsergeev/buildroot/output/build/python-2.7.6/Modules/readline.c:919:54:
error: expected expression before ')' token
/home/vsergeev/buildroot/output/build/python-2.7.6/Modules/readline.c: At
top level:
/home/vsergeev/buildroot/output/build/python-2.7.6/Modules/readline.c:753:1:
warning: 'on_startup_hook' defined but not used [-Wunused-function]
/home/vsergeev/buildroot/output/build/python-2.7.6/Modules/readline.c:760:1:
warning: 'on_pre_input_hook' defined but not used [-Wunused-function]
/home/vsergeev/buildroot/output/build/python-2.7.6/Modules/readline.c:855:1:
warning: 'flex_complete' defined but not used [-Wunused-function]
...
Failed to build these modules:
readline


After patch:

python 2.7.6 Patching
...
Applying python-012-fix-readline-6.3.patch using patch:
patching file Modules/readline.c
...

python 2.7.6 Building
building 'readline' extension
/home/vsergeev/buildroot/output/host/usr/bin/arm-xilinx-linux-gnueabi-gcc
-fPIC -fno-strict-aliasing -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
-D_FILE_OFFSET_BITS=64 -pipe -march=armv7-a -mcpu=cortex-a9 -mfpu=neon-fp16
-mfloat-abi=softfp -ftree-vectorize -Os -DNDEBUG -g -O3 -Wall
-Wstrict-prototypes -I. -IInclude -I./Include
-I/home/vsergeev/buildroot/output/host/usr/arm-buildroot-linux-gnueabi/sysroot/usr/include
-I/home/vsergeev/buildroot/output/build/python-2.7.6/Include
-I/home/vsergeev/buildroot/output/build/python-2.7.6 -c
/home/vsergeev/buildroot/output/build/python-2.7.6/Modules/readline.c -o
build/temp.linux2-arm-2.7/home/vsergeev/buildroot/output/build/python-2.7.6/Modules/readline.o
/home/vsergeev/buildroot/output/build/python-2.7.6/Modules/readline.c: In
function 'setup_readline':
/home/vsergeev/buildroot/output/build/python-2.7.6/Modules/readline.c:919:38:
warning: assignment from incompatible pointer type [enabled by default]
/home/vsergeev/buildroot/output/host/usr/bin/arm-xilinx-linux-gnueabi-gcc
-shared
build/temp.linux2-arm-2.7/home/vsergeev/buildroot/output/build/python-2.7.6/Modules/readline.o
-L/home/vsergeev/buildroot/output/host/usr/arm-buildroot-linux-gnueabi/sysroot/usr/lib
-L/home/vsergeev/buildroot/output/host/usr/arm-buildroot-linux-gnueabi/sysroot/lib
-L/home/opt/Xilinx/SDK/2013.4/gnu/arm/lin/arm-xilinx-linux-gnueabi/lib
-L/home/opt/Xilinx/SDK/2013.4/gnu/arm/lin/lib/gcc -L. -lreadline -lncurses
-lpython2.7 -o build/lib.linux2-arm-2.7/readline.so
...

Thanks,
~vsergeev
Ivan Sergeev


On Wed, Apr 16, 2014 at 2:48 PM, Ivan Sergeev <vsergeev@kumunetworks.com>wrote:

> Signed-off-by: Ivan Sergeev <vsergeev@kumunetworks.com>
> ---
>  package/python/python-012-fix-readline-6.3.patch | 34
> ++++++++++++++++++++++++
>  1 file changed, 34 insertions(+)
>  create mode 100644 package/python/python-012-fix-readline-6.3.patch
>
> diff --git a/package/python/python-012-fix-readline-6.3.patch
> b/package/python/python-012-fix-readline-6.3.patch
> new file mode 100644
> index 0000000..97ae45c
> --- /dev/null
> +++ b/package/python/python-012-fix-readline-6.3.patch
> @@ -0,0 +1,34 @@
> +fix readline extension compilation against readline 6.3
> +
> +readline 6.3 removed some typedefs that had been deprecated for some
> time, but
> +Python 2.7.6 still uses them and therefore fails to build the readline
> +extension when it is enabled. This issue has been addressed in the Python
> bug
> +tracker here: http://bugs.python.org/issue20374. The patch below is
> based on
> +the readline_func_cast.patch patch uploaded there. Also see
> +http://lists.gnu.org/archive/html/bug-readline/2014-03/msg00003.html for
> more
> +information.
> +
> +This patch should be removed with the next Python 2.7 release, which
> should
> +include the fix.
> +
> +Signed-off-by: Ivan Sergeev <vsergeev@kumunetworks.com>
> +
> +diff -purN python-2.7.6.orig/Modules/readline.c
> python-2.7.6/Modules/readline.c
> +--- python-2.7.6.orig/Modules/readline.c       2014-04-16
> 13:40:17.566874715 -0700
> ++++ python-2.7.6/Modules/readline.c    2014-04-16 13:37:15.421231983 -0700
> +@@ -911,12 +911,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 = on_startup_hook;
> + #ifdef HAVE_RL_PRE_INPUT_HOOK
> +-    rl_pre_input_hook = (Function *)on_pre_input_hook;
> ++    rl_pre_input_hook = on_pre_input_hook;
> + #endif
> +     /* Set our completion function */
> +-    rl_attempted_completion_function = (CPPFunction *)flex_complete;
> ++    rl_attempted_completion_function = flex_complete;
> +     /* Set Python word break characters */
> +     completer_word_break_characters =
> +         rl_completer_word_break_characters =
> --
> 1.9.2
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20140416/8600d509/attachment.html>

[Buildroot] [PATCH 1/1] python: fix readline extension compilation with readline 6.3

[Thomas Petazzoni]

Dear Ivan Sergeev,

On Wed, 16 Apr 2014 14:48:43 -0700, Ivan Sergeev wrote:
> Signed-off-by: Ivan Sergeev <vsergeev@kumunetworks.com>
> ---
>  package/python/python-012-fix-readline-6.3.patch | 34 ++++++++++++++++++++++++
>  1 file changed, 34 insertions(+)
>  create mode 100644 package/python/python-012-fix-readline-6.3.patch

Applied, thanks. We really should work on improving the Python stuff to
make it abort the build if a module fails to build.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com