Skip to contentSkip to conversation

python: fix readline extension compilation with readline 6.3

PATCH New Ivan Sergeev 2 participants 3 messages Apr 16, 2014 – Apr 20, 2014

lore
Share & tools
lore

Ivan Sergeev

author
#0 lore raw

PATCH 1/1 python: fix readline extension compilation with readline 6.3

Signed-off-by Ivan Sergeev <[email protected]>
---
 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
package/python/python-012-fix-readline-6.3.patch new file +34 -0
new file mode 100644
index 0000000..97ae45c
@@ -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 <[email protected]>
+
+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 =
Signature · 1 line
1.9.2
author
#1 lore raw

PATCH 1/1 python: fix readline extension compilation with readline 6.3

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

Quoted 56 lines · Ivan Sergeev
Signed-off-by Ivan Sergeev <[email protected]>
---
 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
package/python/python-012-fix-readline-6.3.patch new file +3 -0
new file mode 100644
index 0000000..97ae45c
@@ -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

package/python/python-012-fix-readline-6.3.patch new file +2 -0
+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

package/python/python-012-fix-readline-6.3.patch new file +2 -0
+the readline_func_cast.patch patch uploaded there. Also see
+http://lists.gnu.org/archive/html/bug-readline/2014-03/msg00003.html for

more

package/python/python-012-fix-readline-6.3.patch new file +3 -0
+information.
+
+This patch should be removed with the next Python 2.7 release, which

should

package/python/python-012-fix-readline-6.3.patch new file +5 -0
+include the fix.
+
+Signed-off-by: Ivan Sergeev <[email protected]>
+
+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)

package/python/python-012-fix-readline-6.3.patch new file +15 -1
+     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 =
--
Quoted 3 lines

1.9.2

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20140416/8600d509/attachment.html>

Applied
#2 lore raw

PATCH 1/1 python: fix readline extension compilation with readline 6.3

In reply to Ivan Sergeev

Dear Ivan Sergeev,

Quoted 5 lines · Ivan Sergeev
Signed-off-by Ivan Sergeev <[email protected]>
---
 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

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