Skip to content

Commit 0af08f3

Browse files
authored
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.
1 parent bd627eb commit 0af08f3

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

configure

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10573,8 +10573,9 @@ if test "x$ac_cv_lib_socket_socket" = xyes; then :
1057310573
fi
1057410574
# SVR4 sockets
1057510575

10576-
# Haiku system library
10577-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lnetwork" >&5
10576+
case $ac_sys_system/$ac_sys_release in
10577+
Haiku*)
10578+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lnetwork" >&5
1057810579
$as_echo_n "checking for socket in -lnetwork... " >&6; }
1057910580
if ${ac_cv_lib_network_socket+:} false; then :
1058010581
$as_echo_n "(cached) " >&6
@@ -10614,6 +10615,8 @@ if test "x$ac_cv_lib_network_socket" = xyes; then :
1061410615
LIBS="-lnetwork $LIBS"
1061510616
fi
1061610617

10618+
;;
10619+
esac
1061710620

1061810621
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-libs" >&5
1061910622
$as_echo_n "checking for --with-libs... " >&6; }

configure.ac

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3099,8 +3099,11 @@ AC_SUBST(TZPATH)
30993099
AC_CHECK_LIB(nsl, t_open, [LIBS="-lnsl $LIBS"]) # SVR4
31003100
AC_CHECK_LIB(socket, socket, [LIBS="-lsocket $LIBS"], [], $LIBS) # SVR4 sockets
31013101

3102-
# Haiku system library
3103-
AC_CHECK_LIB(network, socket, [LIBS="-lnetwork $LIBS"], [], $LIBS)
3102+
case $ac_sys_system/$ac_sys_release in
3103+
Haiku*)
3104+
AC_CHECK_LIB(network, socket, [LIBS="-lnetwork $LIBS"], [], $LIBS)
3105+
;;
3106+
esac
31043107

31053108
AC_MSG_CHECKING(for --with-libs)
31063109
AC_ARG_WITH(libs,

0 commit comments

Comments
 (0)