From: Erlend E. Aasland <erlend.aasland@protonmail.com>
Date: Tue, 6 Jun 2023 11:00:38 +0000 (+0200)
Subject: [3.11] gh-90005: Don't link with libbsd if not needed (#105236) (#105359)
X-Git-Tag: v3.11.4~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b8d3bb72b0bfa8bcc0fae282739d4e534c57aac6;p=thirdparty%2FPython%2Fcpython.git

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

The regression was introduced with commit 5b946cada.
Restore pre gh-29696 behaviour.
---

diff --git a/Misc/NEWS.d/next/Build/2023-06-06-09-08-10.gh-issue-90005.8mmeJQ.rst b/Misc/NEWS.d/next/Build/2023-06-06-09-08-10.gh-issue-90005.8mmeJQ.rst
new file mode 100644
index 000000000000..0a23fbf0c0fb
--- /dev/null
+++ b/Misc/NEWS.d/next/Build/2023-06-06-09-08-10.gh-issue-90005.8mmeJQ.rst
@@ -0,0 +1 @@
+Fix a regression in :file:`configure` where we could end up unintentionally linking with ``libbsd``.
diff --git a/configure b/configure
index 9e76287725b9..03aa078c30f8 100755
--- a/configure
+++ b/configure
@@ -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
 
diff --git a/configure.ac b/configure.ac
index c62a565eb68f..1c25abd65a07 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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>])