traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix issue 3645: OpenBSD required -lcurses when linking with readline 

to get the correct completion_matches function to avoid crashes on
x86_64 (amd64).

I don't have OpenBSD to test myself.  I tested that it does not break
anything on linux.  It is simple.
This commit is contained in:
Gregory P. Smith 2008-09-03 05:57:48 +00:00
parent 0151b5350b
commit ff7b2d5ac6
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
configure vendored
View File

@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
# From configure.in Revision: 65183 . # From configure.in Revision: 65652 .
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for python 2.6. # Generated by GNU Autoconf 2.61 for python 2.6.
# #
@ -2076,7 +2076,7 @@ case $ac_sys_system/$ac_sys_release in
# On OpenBSD, select(2) is not available if _XOPEN_SOURCE is defined, # On OpenBSD, select(2) is not available if _XOPEN_SOURCE is defined,
# even though select is a POSIX function. Reported by J. Ribbens. # even though select is a POSIX function. Reported by J. Ribbens.
# Reconfirmed for OpenBSD 3.3 by Zachary Hamm, for 3.4 by Jason Ish. # Reconfirmed for OpenBSD 3.3 by Zachary Hamm, for 3.4 by Jason Ish.
OpenBSD/2.* | OpenBSD/3.[0123456789] | OpenBSD/4.[0123]) OpenBSD*)
define_xopen_source=no define_xopen_source=no
# OpenBSD undoes our definition of __BSD_VISIBLE if _XOPEN_SOURCE is # OpenBSD undoes our definition of __BSD_VISIBLE if _XOPEN_SOURCE is
# also defined. This can be overridden by defining _BSD_SOURCE # also defined. This can be overridden by defining _BSD_SOURCE
@ -2086,6 +2086,8 @@ cat >>confdefs.h <<\_ACEOF
#define _BSD_SOURCE 1 #define _BSD_SOURCE 1
_ACEOF _ACEOF
# OpenBSD's readline library needs the libcurses
READLINE_LIBS="-lcurses"
;; ;;
# Defining _XOPEN_SOURCE on NetBSD version prior to the introduction of # Defining _XOPEN_SOURCE on NetBSD version prior to the introduction of
# _NETBSD_SOURCE disables certain features (eg. setgroups). Reported by # _NETBSD_SOURCE disables certain features (eg. setgroups). Reported by
@ -22965,7 +22967,7 @@ if test "${ac_cv_lib_readline_readline+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
else else
ac_check_lib_save_LIBS=$LIBS ac_check_lib_save_LIBS=$LIBS
LIBS="-lreadline $LIBS" LIBS="-lreadline $READLINE_LIBS $LIBS"
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */ /* confdefs.h. */
_ACEOF _ACEOF
@ -23111,7 +23113,7 @@ if test "${ac_cv_lib_readline_rl_callback_handler_install+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
else else
ac_check_lib_save_LIBS=$LIBS ac_check_lib_save_LIBS=$LIBS
LIBS="-lreadline $LIBS" LIBS="-lreadline $READLINE_LIBS $LIBS"
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */ /* confdefs.h. */
_ACEOF _ACEOF
@ -23239,7 +23241,7 @@ if test "${ac_cv_lib_readline_rl_pre_input_hook+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
else else
ac_check_lib_save_LIBS=$LIBS ac_check_lib_save_LIBS=$LIBS
LIBS="-lreadline $LIBS" LIBS="-lreadline $READLINE_LIBS $LIBS"
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */ /* confdefs.h. */
_ACEOF _ACEOF
@ -23310,7 +23312,7 @@ if test "${ac_cv_lib_readline_rl_completion_display_matches_hook+set}" = set; th
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
else else
ac_check_lib_save_LIBS=$LIBS ac_check_lib_save_LIBS=$LIBS
LIBS="-lreadline $LIBS" LIBS="-lreadline $READLINE_LIBS $LIBS"
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */ /* confdefs.h. */
_ACEOF _ACEOF
@ -23381,7 +23383,7 @@ if test "${ac_cv_lib_readline_rl_completion_matches+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
else else
ac_check_lib_save_LIBS=$LIBS ac_check_lib_save_LIBS=$LIBS
LIBS="-lreadline $LIBS" LIBS="-lreadline $READLINE_LIBS $LIBS"
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */ /* confdefs.h. */
_ACEOF _ACEOF

14
configure.in
View File

@ -251,12 +251,14 @@ case $ac_sys_system/$ac_sys_release in
# On OpenBSD, select(2) is not available if _XOPEN_SOURCE is defined, # On OpenBSD, select(2) is not available if _XOPEN_SOURCE is defined,
# even though select is a POSIX function. Reported by J. Ribbens. # even though select is a POSIX function. Reported by J. Ribbens.
# Reconfirmed for OpenBSD 3.3 by Zachary Hamm, for 3.4 by Jason Ish. # Reconfirmed for OpenBSD 3.3 by Zachary Hamm, for 3.4 by Jason Ish.
OpenBSD/2.* | OpenBSD/3.@<:@0123456789@:>@ | OpenBSD/4.@<:@0123@:>@) OpenBSD*)
define_xopen_source=no define_xopen_source=no
# OpenBSD undoes our definition of __BSD_VISIBLE if _XOPEN_SOURCE is # OpenBSD undoes our definition of __BSD_VISIBLE if _XOPEN_SOURCE is
# also defined. This can be overridden by defining _BSD_SOURCE # also defined. This can be overridden by defining _BSD_SOURCE
# As this has a different meaning on Linux, only define it on OpenBSD # As this has a different meaning on Linux, only define it on OpenBSD
AC_DEFINE(_BSD_SOURCE, 1, [Define on OpenBSD to activate all library features]) AC_DEFINE(_BSD_SOURCE, 1, [Define on OpenBSD to activate all library features])
# OpenBSD's readline library needs the libcurses
READLINE_LIBS="-lcurses"
;; ;;
# Defining _XOPEN_SOURCE on NetBSD version prior to the introduction of # Defining _XOPEN_SOURCE on NetBSD version prior to the introduction of
# _NETBSD_SOURCE disables certain features (eg. setgroups). Reported by # _NETBSD_SOURCE disables certain features (eg. setgroups). Reported by
@ -3324,7 +3326,7 @@ fi
# check where readline lives # check where readline lives
# save the value of LIBS so we don't actually link Python with readline # save the value of LIBS so we don't actually link Python with readline
LIBS_no_readline=$LIBS LIBS_no_readline=$LIBS
AC_CHECK_LIB(readline, readline) AC_CHECK_LIB(readline, readline, , ,$READLINE_LIBS)
if test "$ac_cv_have_readline_readline" = no if test "$ac_cv_have_readline_readline" = no
then then
AC_CHECK_LIB(termcap, readline) AC_CHECK_LIB(termcap, readline)
@ -3333,7 +3335,7 @@ fi
# check for readline 2.1 # check for readline 2.1
AC_CHECK_LIB(readline, rl_callback_handler_install, AC_CHECK_LIB(readline, rl_callback_handler_install,
AC_DEFINE(HAVE_RL_CALLBACK, 1, AC_DEFINE(HAVE_RL_CALLBACK, 1,
[Define if you have readline 2.1]), , ) [Define if you have readline 2.1]), ,$READLINE_LIBS)
# check for readline 2.2 # check for readline 2.2
AC_TRY_CPP([#include <readline/readline.h>], AC_TRY_CPP([#include <readline/readline.h>],
@ -3349,17 +3351,17 @@ fi
# check for readline 4.0 # check for readline 4.0
AC_CHECK_LIB(readline, rl_pre_input_hook, AC_CHECK_LIB(readline, rl_pre_input_hook,
AC_DEFINE(HAVE_RL_PRE_INPUT_HOOK, 1, AC_DEFINE(HAVE_RL_PRE_INPUT_HOOK, 1,
[Define if you have readline 4.0]), , ) [Define if you have readline 4.0]), ,$READLINE_LIBS)
# also in 4.0 # also in 4.0
AC_CHECK_LIB(readline, rl_completion_display_matches_hook, AC_CHECK_LIB(readline, rl_completion_display_matches_hook,
AC_DEFINE(HAVE_RL_COMPLETION_DISPLAY_MATCHES_HOOK, 1, AC_DEFINE(HAVE_RL_COMPLETION_DISPLAY_MATCHES_HOOK, 1,
[Define if you have readline 4.0]), , ) [Define if you have readline 4.0]), ,$READLINE_LIBS)
# check for readline 4.2 # check for readline 4.2
AC_CHECK_LIB(readline, rl_completion_matches, AC_CHECK_LIB(readline, rl_completion_matches,
AC_DEFINE(HAVE_RL_COMPLETION_MATCHES, 1, AC_DEFINE(HAVE_RL_COMPLETION_MATCHES, 1,
[Define if you have readline 4.2]), , ) [Define if you have readline 4.2]), ,$READLINE_LIBS)
# also in readline 4.2 # also in readline 4.2
AC_TRY_CPP([#include <readline/readline.h>], AC_TRY_CPP([#include <readline/readline.h>],