From: Erlend E. Aasland <erlend.aasland@protonmail.com>
Date: Tue, 6 Jun 2023 09:33:01 +0000 (+0200)
Subject: gh-90005: Don't link with libbsd if not needed (#105236)
X-Git-Tag: v3.13.0a1~1887
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e01c4de35dd40b132e57f4ba801991619bd2726b;p=thirdparty%2FPython%2Fcpython.git

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

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 d2a667f62a8e..7f17fe42120a 100755
--- a/configure
+++ b/configure
@@ -18968,13 +18968,15 @@ fi
 printf "%s\n" "$ac_cv_flock_decl" >&6; }
 if test "x$ac_cv_flock_decl" = xyes
 then :
+
+  for ac_func in flock
+do :
   ac_fn_c_check_func "$LINENO" "flock" "ac_cv_func_flock"
 if test "x$ac_cv_func_flock" = xyes
 then :
   printf "%s\n" "#define HAVE_FLOCK 1" >>confdefs.h
 
-fi
-
+else $as_nop
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for flock in -lbsd" >&5
 printf %s "checking for flock in -lbsd... " >&6; }
 if test ${ac_cv_lib_bsd_flock+y}
@@ -19015,7 +19017,9 @@ then :
   FCNTL_LIBS="-lbsd"
 fi
 
+fi
 
+done
 fi
 
 
diff --git a/configure.ac b/configure.ac
index f8f428aaaaf3..3d03fa6f611d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4908,9 +4908,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>])