diff options
| author | antoine <antoine@FreeBSD.org> | 2014-03-01 23:53:29 +0800 |
|---|---|---|
| committer | antoine <antoine@FreeBSD.org> | 2014-03-01 23:53:29 +0800 |
| commit | 2aa2b2e6086aaf9d1b9b4d494ae9fe5aa0eb0abd (patch) | |
| tree | b5cc7e04959f9c251516b12f373fe4ba04807094 /lang | |
| parent | 9e4e8dbac56ef9dd7b02cf808ab1e642a4f9abe1 (diff) | |
| download | freebsd-ports-gnome-2aa2b2e6086aaf9d1b9b4d494ae9fe5aa0eb0abd.tar.gz freebsd-ports-gnome-2aa2b2e6086aaf9d1b9b4d494ae9fe5aa0eb0abd.tar.zst freebsd-ports-gnome-2aa2b2e6086aaf9d1b9b4d494ae9fe5aa0eb0abd.zip | |
- Fix build with readline 6.3 from ports
the patch was backported from upstream (issue #20374)
- Add missing USES=readline
Obtained from: python
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/python31/Makefile | 1 | ||||
| -rw-r--r-- | lang/python31/files/patch-issue20374 | 54 |
2 files changed, 55 insertions, 0 deletions
diff --git a/lang/python31/Makefile b/lang/python31/Makefile index 569e4920a5fd..927fae4b7ee9 100644 --- a/lang/python31/Makefile +++ b/lang/python31/Makefile @@ -27,6 +27,7 @@ MAKE_ENV= VPATH="${PYTHON_WRKSRC}" INSTALL_TARGET= altinstall +USES= readline USE_LDCONFIG= yes USE_PYTHON= yes USE_XZ= yes diff --git a/lang/python31/files/patch-issue20374 b/lang/python31/files/patch-issue20374 new file mode 100644 index 000000000000..867478d2ad67 --- /dev/null +++ b/lang/python31/files/patch-issue20374 @@ -0,0 +1,54 @@ +# Description: fix readline.so build with readline 6.3 +# Patch obtained from upstream, issue #20374 +# http://bugs.python.org/issue20374 + +--- ./Modules/readline.c.orig 2012-04-09 23:25:36.000000000 +0000 ++++ ./Modules/readline.c 2014-03-01 15:37:28.000000000 +0000 +@@ -693,14 +693,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); + } +@@ -794,7 +802,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'; +@@ -834,12 +842,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 */ + rl_completer_word_break_characters = + strdup(" \t\n`~!@#$%^&*()-=+[{]}\\|;:'\",<>/?"); |