Skip to content

Commit

Permalink
[3.11] gh-90005: Don't link with libbsd if not needed (#105236) (#105359
Browse files Browse the repository at this point in the history
)

The regression was introduced with commit 5b946ca.
Restore pre gh-29696 behaviour.
  • Loading branch information
erlend-aasland authored Jun 6, 2023
1 parent faae548 commit b8d3bb7
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix a regression in :file:`configure` where we could end up unintentionally linking with ``libbsd``.
6 changes: 3 additions & 3 deletions configure

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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>])

Expand Down

0 comments on commit b8d3bb7

Please sign in to comment.