Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

gh-98636: Fix detecting gdbm_compat for _dbm module (#98643) 

Fix the gdbm_compat library detection logic to actually check for
-lgdbm_compat independently of the ndbm detection.
This fixes the build failure with `--with-dbmliborder=gdbm`,
and implicit fallback to ndbm with the default value.
This commit is contained in:
Michał Górny 2023-01-11 22:46:28 +01:00 committed by GitHub
parent 07a87f74fa
commit 02a72f080d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Misc/ACKS
View File

@ -640,6 +640,7 @@ Tiago Gonçalves
Chris Gonnerman Chris Gonnerman
Shelley Gooch Shelley Gooch
David Goodger David Goodger
Michał Górny
Elliot Gorokhovsky Elliot Gorokhovsky
Hans de Graaff Hans de Graaff
Tim Graham Tim Graham

2
Misc/NEWS.d/next/Build/2022-10-25-11-53-55.gh-issue-98636.e0RPAr.rst Normal file
View File

@ -0,0 +1,2 @@
Fix a regression in detecting ``gdbm_compat`` library for the ``_gdbm``
module build.

5
configure generated vendored
View File

@ -14710,6 +14710,7 @@ fi
{ ac_cv_header_gdbm_ndbm_h=; unset ac_cv_header_gdbm_ndbm_h;} { ac_cv_header_gdbm_ndbm_h=; unset ac_cv_header_gdbm_ndbm_h;}
if test "$ac_cv_header_gdbm_slash_ndbm_h" = yes -o "$ac_cv_header_gdbm_dash_ndbm_h" = yes; then if test "$ac_cv_header_gdbm_slash_ndbm_h" = yes -o "$ac_cv_header_gdbm_dash_ndbm_h" = yes; then
{ ac_cv_search_dbm_open=; unset ac_cv_search_dbm_open;}
save_CFLAGS=$CFLAGS save_CFLAGS=$CFLAGS
save_CPPFLAGS=$CPPFLAGS save_CPPFLAGS=$CPPFLAGS
save_LDFLAGS=$LDFLAGS save_LDFLAGS=$LDFLAGS
@ -14769,7 +14770,9 @@ $as_echo "$ac_cv_search_dbm_open" >&6; }
ac_res=$ac_cv_search_dbm_open ac_res=$ac_cv_search_dbm_open
if test "$ac_res" != no; then : if test "$ac_res" != no; then :
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
have_gdbm_compat=yes
else
have_gdbm_compat=no
fi fi

3
configure.ac
View File

@ -4120,8 +4120,9 @@ AS_VAR_IF([ac_cv_header_gdbm_dash_ndbm_h], [yes], [
AS_UNSET([ac_cv_header_gdbm_ndbm_h]) AS_UNSET([ac_cv_header_gdbm_ndbm_h])
if test "$ac_cv_header_gdbm_slash_ndbm_h" = yes -o "$ac_cv_header_gdbm_dash_ndbm_h" = yes; then if test "$ac_cv_header_gdbm_slash_ndbm_h" = yes -o "$ac_cv_header_gdbm_dash_ndbm_h" = yes; then
AS_UNSET([ac_cv_search_dbm_open])
WITH_SAVE_ENV([ WITH_SAVE_ENV([
AC_SEARCH_LIBS([dbm_open], [gdbm_compat]) AC_SEARCH_LIBS([dbm_open], [gdbm_compat], [have_gdbm_compat=yes], [have_gdbm_compat=no])
]) ])
fi fi