summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNed Deily <nad@python.org>2021-10-05 06:02:57 -0400
committerGitHub <noreply@github.com>2021-10-05 11:02:57 +0100
commit0af08f343a7b792f527b78e2a35d9453039940c2 (patch)
tree8ed6359f38c7734bde75576f2f44e8c5b42ec9ce
parentbd627eb7ed08a891dd1356756feb1ce2600358e4 (diff)
downloadcpython-git-0af08f343a7b792f527b78e2a35d9453039940c2.tar.gz
bpo-45163: Restrict added libnetwork check to builds on Haiku. (GH-28729)
For example, without the guard the check could cause macOS installer builds to fail to install on older supported macOS releases where libnetwork is not available and is not needed on any release.
-rwxr-xr-xconfigure7
-rw-r--r--configure.ac7
2 files changed, 10 insertions, 4 deletions
diff --git a/configure b/configure
index 3b39641bab..3a6cf30517 100755
--- a/configure
+++ b/configure
@@ -10573,8 +10573,9 @@ if test "x$ac_cv_lib_socket_socket" = xyes; then :
fi
# SVR4 sockets
-# Haiku system library
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lnetwork" >&5
+case $ac_sys_system/$ac_sys_release in
+ Haiku*)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lnetwork" >&5
$as_echo_n "checking for socket in -lnetwork... " >&6; }
if ${ac_cv_lib_network_socket+:} false; then :
$as_echo_n "(cached) " >&6
@@ -10614,6 +10615,8 @@ if test "x$ac_cv_lib_network_socket" = xyes; then :
LIBS="-lnetwork $LIBS"
fi
+ ;;
+esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-libs" >&5
$as_echo_n "checking for --with-libs... " >&6; }
diff --git a/configure.ac b/configure.ac
index 908dd28e7a..c7cb797e8f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3099,8 +3099,11 @@ AC_SUBST(TZPATH)
AC_CHECK_LIB(nsl, t_open, [LIBS="-lnsl $LIBS"]) # SVR4
AC_CHECK_LIB(socket, socket, [LIBS="-lsocket $LIBS"], [], $LIBS) # SVR4 sockets
-# Haiku system library
-AC_CHECK_LIB(network, socket, [LIBS="-lnetwork $LIBS"], [], $LIBS)
+case $ac_sys_system/$ac_sys_release in
+ Haiku*)
+ AC_CHECK_LIB(network, socket, [LIBS="-lnetwork $LIBS"], [], $LIBS)
+ ;;
+esac
AC_MSG_CHECKING(for --with-libs)
AC_ARG_WITH(libs,