diff options
| author | Antoine Brodin <antoine@FreeBSD.org> | 2014-03-01 14:28:08 +0000 |
|---|---|---|
| committer | Antoine Brodin <antoine@FreeBSD.org> | 2014-03-01 14:28:08 +0000 |
| commit | bacc41af947183545582c41bc8c7cef1d8e1a02b (patch) | |
| tree | c030dcc30bce0ef28d40850833b8936d9d0820f7 /lang/python33 | |
| parent | 5a38992694d0880d413f086dd2dabcc880198aef (diff) | |
Notes
Diffstat (limited to 'lang/python33')
| -rw-r--r-- | lang/python33/Makefile | 2 | ||||
| -rw-r--r-- | lang/python33/files/patch-issue20374 | 55 |
2 files changed, 56 insertions, 1 deletions
diff --git a/lang/python33/Makefile b/lang/python33/Makefile index 10036bd57530..a05334c819de 100644 --- a/lang/python33/Makefile +++ b/lang/python33/Makefile @@ -21,7 +21,7 @@ MAKE_ENV= VPATH="${PYTHON_WRKSRC}" INSTALL_TARGET= altinstall -USES= gmake +USES= gmake readline USE_LDCONFIG= yes USE_PYTHON= yes USE_XZ= yes diff --git a/lang/python33/files/patch-issue20374 b/lang/python33/files/patch-issue20374 new file mode 100644 index 000000000000..763125f80b18 --- /dev/null +++ b/lang/python33/files/patch-issue20374 @@ -0,0 +1,55 @@ +# Description: fix readline.so build with readline 6.3 +# Patch obtained from upstream, issue #20374 +# http://bugs.python.org/issue20374 +# PR: ports/187176 + +--- ./Modules/readline.c.orig 2013-11-17 07:23:01.000000000 +0000 ++++ ./Modules/readline.c 2014-03-01 13:05:47.000000000 +0000 +@@ -774,14 +774,22 @@ + } + + 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); + } +@@ -877,7 +885,7 @@ + * before calling the normal completer */ + + static char ** +-flex_complete(char *text, int start, int end) ++flex_complete(const char *text, int start, int end) + { + #ifdef HAVE_RL_COMPLETION_APPEND_CHARACTER + rl_completion_append_character ='\0'; +@@ -936,12 +944,12 @@ + 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 = |