diff options
| author | Erlend E. Aasland <erlend.aasland@protonmail.com> | 2023-06-06 10:58:13 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-06 10:58:13 (GMT) |
| commit | 6f3a4fd4f23f8013cca5abdf03bcc7dd4adf8637 (patch) | |
| tree | d5151ee4e03430c95a4900f919bd27bf42973e0a | |
| parent | 3aa3be4fe3f64ccaf2b6235bd3addeb5c1313002 (diff) | |
| download | cpython-6f3a4fd4f23f8013cca5abdf03bcc7dd4adf8637.zip cpython-6f3a4fd4f23f8013cca5abdf03bcc7dd4adf8637.tar.gz cpython-6f3a4fd4f23f8013cca5abdf03bcc7dd4adf8637.tar.bz2 | |
[3.12] gh-90005: Don't link with libbsd if not needed (#105236) (#105360)
The regression was introduced with commit 5b946cada.
Restore pre gh-29696 behaviour.
| -rw-r--r-- | Misc/NEWS.d/next/Build/2023-06-06-09-08-10.gh-issue-90005.8mmeJQ.rst | 1 | ||||
| -rwxr-xr-x | configure | 8 | ||||
| -rw-r--r-- | configure.ac | 5 |
3 files changed, 9 insertions, 5 deletions
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 0000000..0a23fbf --- /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``. @@ -19278,13 +19278,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} @@ -19325,7 +19327,9 @@ then : FCNTL_LIBS="-lbsd" fi +fi +done fi diff --git a/configure.ac b/configure.ac index e0a6958..dc9359e 100644 --- a/configure.ac +++ b/configure.ac @@ -4936,9 +4936,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>]) |