[Python-checkins] bpo-45847: Fix _crypt detection on Ubuntu (GH-29743)

tiran webhook-mailer at python.org
Wed Nov 24 04:47:31 EST 2021


https://github.com/python/cpython/commit/64c3807da93fc3e0c15bc376f220b2d24551023e
commit: 64c3807da93fc3e0c15bc376f220b2d24551023e
branch: main
author: Christian Heimes <christian at python.org>
committer: tiran <christian at python.org>
date: 2021-11-24T10:47:22+01:00
summary:

bpo-45847: Fix _crypt detection on Ubuntu (GH-29743)

files:
M configure
M configure.ac

diff --git a/configure b/configure
index d2d79920d08ff..abfda2b00de74 100755
--- a/configure
+++ b/configure
@@ -15805,7 +15805,7 @@ save_LIBS=$LIBS
 
 
   CPPFLAGS="$LIBCRYPT_CFLAGS $CFLAGS"
-  LDFLAGS="$LIBCRYPT_LIBS $LDFLAGS"
+  LIBS="$LIBCRYPT_LIBS $LIBS"
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for crypt or crypt_r" >&5
 $as_echo_n "checking for crypt or crypt_r... " >&6; }
 if ${ac_cv_crypt_crypt+:} false; then :
diff --git a/configure.ac b/configure.ac
index 4961e5a2553c3..1853baa5a8e8c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4243,7 +4243,7 @@ PKG_CHECK_MODULES([LIBCRYPT], [libxcrypt >= 3.1.1], [
 
 WITH_SAVE_ENV([
   CPPFLAGS="$LIBCRYPT_CFLAGS $CFLAGS"
-  LDFLAGS="$LIBCRYPT_LIBS $LDFLAGS"
+  LIBS="$LIBCRYPT_LIBS $LIBS"
   AC_CACHE_CHECK([for crypt or crypt_r], [ac_cv_crypt_crypt], [
     AC_LINK_IFELSE([AC_LANG_PROGRAM([
         #ifdef HAVE_CRYPT_H



More information about the Python-checkins mailing list