Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

gh-115806: Make configure output more readable (#115807) 

- make sure LDLIBRARY and HOSTRUNNER checks don't overlap
- make the ipv6 library check less subtle
This commit is contained in:
Erlend E. Aasland 2024-02-23 10:52:06 +01:00 committed by GitHub
parent 2e92ffd7fa
commit e74cd0f910
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
configure generated vendored
View File

@ -7386,11 +7386,15 @@ else # shared is disabled
;;
esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LDLIBRARY" >&5
printf "%s\n" "$LDLIBRARY" >&6; }
if test "$cross_compiling" = yes; then
RUNSHARED=
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking HOSTRUNNER" >&5
printf %s "checking HOSTRUNNER... " >&6; }
if test -z "$HOSTRUNNER"
then
@ -7574,8 +7578,6 @@ fi
esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking HOSTRUNNER" >&5
printf %s "checking HOSTRUNNER... " >&6; }
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $HOSTRUNNER" >&5
printf "%s\n" "$HOSTRUNNER" >&6; }
@ -7583,9 +7585,6 @@ if test -n "$HOSTRUNNER"; then
PYTHON_FOR_BUILD="_PYTHON_HOSTRUNNER='$HOSTRUNNER' $PYTHON_FOR_BUILD"
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LDLIBRARY" >&5
printf "%s\n" "$LDLIBRARY" >&6; }
# LIBRARY_DEPS, LINK_PYTHON_OBJS and LINK_PYTHON_DEPS variable
case $ac_sys_system/$ac_sys_emscripten_target in #(
Emscripten/browser*) :
@ -16755,16 +16754,18 @@ printf "%s\n" "$ipv6type" >&6; }
fi
if test "$ipv6" = "yes" -a "$ipv6lib" != "none"; then
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking ipv6 library" >&5
printf %s "checking ipv6 library... " >&6; }
if test -d $ipv6libdir -a -f $ipv6libdir/lib$ipv6lib.a; then
LIBS="-L$ipv6libdir -l$ipv6lib $LIBS"
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: using lib$ipv6lib" >&5
printf "%s\n" "$as_me: using lib$ipv6lib" >&6;}
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: lib$ipv6lib" >&5
printf "%s\n" "lib$ipv6lib" >&6; }
else
if test "x$ipv6trylibc" = xyes
then :
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: using libc" >&5
printf "%s\n" "$as_me: using libc" >&6;}
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: libc" >&5
printf "%s\n" "libc" >&6; }
else $as_nop

10
configure.ac
View File

@ -1415,11 +1415,13 @@ else # shared is disabled
;;
esac
fi
AC_MSG_RESULT([$LDLIBRARY])
if test "$cross_compiling" = yes; then
RUNSHARED=
fi
AC_MSG_CHECKING([HOSTRUNNER])
AC_ARG_VAR([HOSTRUNNER], [Program to run CPython for the host platform])
if test -z "$HOSTRUNNER"
then
@ -1465,7 +1467,6 @@ then
)
fi
AC_SUBST([HOSTRUNNER])
AC_MSG_CHECKING([HOSTRUNNER])
AC_MSG_RESULT([$HOSTRUNNER])
if test -n "$HOSTRUNNER"; then
@ -1473,8 +1474,6 @@ if test -n "$HOSTRUNNER"; then
PYTHON_FOR_BUILD="_PYTHON_HOSTRUNNER='$HOSTRUNNER' $PYTHON_FOR_BUILD"
fi
AC_MSG_RESULT([$LDLIBRARY])
# LIBRARY_DEPS, LINK_PYTHON_OBJS and LINK_PYTHON_DEPS variable
AS_CASE([$ac_sys_system/$ac_sys_emscripten_target],
[Emscripten/browser*], [LIBRARY_DEPS='$(PY3LIBRARY) $(WASM_STDLIB) python.html python.worker.js'],
@ -4522,12 +4521,13 @@ yes
fi
if test "$ipv6" = "yes" -a "$ipv6lib" != "none"; then
AC_MSG_CHECKING([ipv6 library])
if test -d $ipv6libdir -a -f $ipv6libdir/lib$ipv6lib.a; then
LIBS="-L$ipv6libdir -l$ipv6lib $LIBS"
AC_MSG_NOTICE([using lib$ipv6lib])
AC_MSG_RESULT([lib$ipv6lib])
else
AS_VAR_IF([ipv6trylibc], [yes], [
AC_MSG_NOTICE([using libc])
AC_MSG_RESULT([libc])
], [
AC_MSG_ERROR([m4_normalize([
No $ipv6lib library found; cannot continue.