mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-30 12:21:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

[3.11] gh-90005: Don't link with libbsd if not needed (#105236) (#105359)

Browse source 
The regression was introduced with commit 5b946cada.
Restore pre gh-29696 behaviour.
This commit is contained in:
Erlend E. Aasland 2023-06-06 13:00:38 +02:00 • committed by GitHub
parent faae548e0e
commit b8d3bb72b0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Misc/NEWS.d/next/Build/2023-06-06-09-08-10.gh-issue-90005.8mmeJQ.rst Normal file
View file

@ -0,0 +1 @@
Fix a regression in :file:`configure` where we could end up unintentionally linking with ``libbsd``.

6
configure generated vendored
View file

@ -15796,9 +15796,7 @@ if test "x$ac_cv_func_flock" = xyes; then :
#define HAVE_FLOCK 1
_ACEOF
fi
done
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for flock in -lbsd" >&5
$as_echo_n "checking for flock in -lbsd... " >&6; }
if ${ac_cv_lib_bsd_flock+:} false; then :
@ -15839,6 +15837,8 @@ if test "x$ac_cv_lib_bsd_flock" = xyes; then :
FCNTL_LIBS="-lbsd"
fi
fi
done
fi

5
configure.ac
View file

@ -4696,9 +4696,8 @@ AC_CACHE_CHECK([for flock declaration], [ac_cv_flock_decl],
])
dnl Linking with libbsd may be necessary on AIX for flock function.
AS_VAR_IF([ac_cv_flock_decl], [yes],
AC_CHECK_FUNCS([flock])
AC_CHECK_LIB([bsd], [flock], [FCNTL_LIBS="-lbsd"])
)
[AC_CHECK_FUNCS([flock], [],
[AC_CHECK_LIB([bsd], [flock], [FCNTL_LIBS="-lbsd"])])])
PY_CHECK_FUNC([getpagesize], [#include <unistd.h>])