Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gh-117845: Detect libedit hook function signature in configure #117870

Merged
merged 7 commits into from
Apr 17, 2024
Merged

gh-117845: Detect libedit hook function signature in configure #117870

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e932a1a
gh-117845: Fix type mismatch for hook functions with libedit
jmroot Apr 14, 2024
1563484
Adopt review suggestions
jmroot Apr 15, 2024
45c1187
Update macro name
jmroot Apr 15, 2024
64c41d5
Regenerate configure
erlend-aasland Apr 15, 2024
9b2ab09
📜🤖 Added by blurb_it.
blurb-it[bot] Apr 15, 2024
9322a84
Update Misc/NEWS.d/next/Build/2024-04-15-08-35-06.gh-issue-117845.Iow…
erlend-aasland Apr 15, 2024
75dc1b3
Merge branch 'main' into rl_hook_types
erlend-aasland Apr 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Build/2024-04-15-08-35-06.gh-issue-117845.IowzyW.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix building against recent libedit versions by detecting readline hook signatures in :program:`configure`.
4 changes: 2 additions & 2 deletions Modules/readline.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1041,7 +1041,7 @@ on_hook(PyObject *func)
}

static int
#if defined(_RL_FUNCTION_TYPEDEF)
#if defined(_RL_FUNCTION_TYPEDEF) || !defined(Py_RL_STARTUP_HOOK_TAKES_ARGS)
on_startup_hook(void)
#else
on_startup_hook(const char *Py_UNUSED(text), int Py_UNUSED(state))
Expand All @@ -1061,7 +1061,7 @@ on_startup_hook(const char *Py_UNUSED(text), int Py_UNUSED(state))

#ifdef HAVE_RL_PRE_INPUT_HOOK
static int
#if defined(_RL_FUNCTION_TYPEDEF)
#if defined(_RL_FUNCTION_TYPEDEF) || !defined(Py_RL_STARTUP_HOOK_TAKES_ARGS)
on_pre_input_hook(void)
#else
on_pre_input_hook(const char *Py_UNUSED(text), int Py_UNUSED(state))
Expand Down
50 changes: 50 additions & 0 deletions configure
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 15 additions & 0 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6340,6 +6340,21 @@ AS_VAR_IF([with_readline], [no], [
# in readline as well as newer editline (April 2023)
AC_CHECK_TYPES([rl_compdisp_func_t], [], [], [readline_includes])

# Some editline versions declare rl_startup_hook as taking no args, others
# declare it as taking 2.
AC_CACHE_CHECK([if rl_startup_hook takes arguments], [ac_cv_readline_rl_startup_hook_takes_args], [
AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM([readline_includes]
[extern int test_hook_func(const char *text, int state);],
[rl_startup_hook=test_hook_func;])],
[ac_cv_readline_rl_startup_hook_takes_args=yes],
[ac_cv_readline_rl_startup_hook_takes_args=no]
)
])
AS_VAR_IF([ac_cv_readline_rl_startup_hook_takes_args], [yes], [
AC_DEFINE([Py_RL_STARTUP_HOOK_TAKES_ARGS], [1], [Define if rl_startup_hook takes arguments])
sobolevn marked this conversation as resolved.
Show resolved Hide resolved
])

m4_undefine([readline_includes])
])dnl WITH_SAVE_ENV()
])
Expand Down
3 changes: 3 additions & 0 deletions pyconfig.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1659,6 +1659,9 @@
SipHash13: 3, externally defined: 0 */
#undef Py_HASH_ALGORITHM

/* Define if rl_startup_hook takes arguments */
#undef Py_RL_STARTUP_HOOK_TAKES_ARGS

/* Define if you want to enable internal statistics gathering. */
#undef Py_STATS

Expand Down
Loading