Date: Sat, 1 Mar 2014 15:19:43 +0000 (UTC) From: Antoine Brodin <antoine@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r346632 - in head/lang/python32: . files Message-ID: <201403011519.s21FJhnk022347@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: antoine Date: Sat Mar 1 15:19:43 2014 New Revision: 346632 URL: http://svnweb.freebsd.org/changeset/ports/346632 QAT: https://qat.redports.org/buildarchive/r346632/ Log: - Fix build with readline 6.3 from ports the patch was backported from upstream (issue #20374) - Add missing USES=readline Obtained from: python Added: head/lang/python32/files/patch-issue20374 (contents, props changed) Modified: head/lang/python32/Makefile Modified: head/lang/python32/Makefile ============================================================================== --- head/lang/python32/Makefile Sat Mar 1 15:01:13 2014 (r346631) +++ head/lang/python32/Makefile Sat Mar 1 15:19:43 2014 (r346632) @@ -21,6 +21,7 @@ MAKE_ENV= VPATH="${PYTHON_WRKSRC}" INSTALL_TARGET= altinstall +USES= readline USE_LDCONFIG= yes USE_PYTHON= yes USE_XZ= yes Added: head/lang/python32/files/patch-issue20374 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/python32/files/patch-issue20374 Sat Mar 1 15:19:43 2014 (r346632) @@ -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 2013-05-15 16:33:54.000000000 +0000 ++++ ./Modules/readline.c 2014-03-01 14:58:46.000000000 +0000 +@@ -761,14 +761,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); + } +@@ -864,7 +872,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'; +@@ -912,12 +920,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`~!@#$%^&*()-=+[{]}\\|;:'\",<>/?");
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403011519.s21FJhnk022347>