Skip to content

Commit e01c4de

Browse files
gh-90005: Don't link with libbsd if not needed (#105236)
The regression was introduced with commit 5b946ca. Restore pre gh-29696 behaviour.
1 parent f4d8e10 commit e01c4de

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix a regression in :file:`configure` where we could end up unintentionally linking with ``libbsd``.

configure

+6-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

configure.ac

+2-3
Original file line numberDiff line numberDiff line change
@@ -4908,9 +4908,8 @@ AC_CACHE_CHECK([for flock declaration], [ac_cv_flock_decl],
49084908
])
49094909
dnl Linking with libbsd may be necessary on AIX for flock function.
49104910
AS_VAR_IF([ac_cv_flock_decl], [yes],
4911-
AC_CHECK_FUNCS([flock])
4912-
AC_CHECK_LIB([bsd], [flock], [FCNTL_LIBS="-lbsd"])
4913-
)
4911+
[AC_CHECK_FUNCS([flock], [],
4912+
[AC_CHECK_LIB([bsd], [flock], [FCNTL_LIBS="-lbsd"])])])
49144913

49154914
PY_CHECK_FUNC([getpagesize], [#include <unistd.h>])
49164915

0 commit comments

Comments
 (0)