aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2021-10-11 13:50:03 -0400
committerSam James <sam@gentoo.org>2021-11-06 01:43:27 +0000
commit87028987c2af3262f15d3dd5e1c0e537e4bcce36 (patch)
tree84bb5f6cee2279de7f8ebe6adfc6d938da7cb462
parentFix dictionary iteration error in _ExecutorManagerThread (diff)
downloadcpython-87028987c2af3262f15d3dd5e1c0e537e4bcce36.tar.gz
cpython-87028987c2af3262f15d3dd5e1c0e537e4bcce36.tar.bz2
cpython-87028987c2af3262f15d3dd5e1c0e537e4bcce36.zip
bpo-45433: Do not link libpython against libcryptgentoo-3.9.8
Save/restore LIBS when calling AC_SEARCH_LIBS(..., crypt). This avoid linking libpython with libcrypt.
-rw-r--r--configure.ac3
1 files changed, 3 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index c2ba4c4a46e..bdfef8d5ffd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4038,6 +4038,8 @@ AC_CHECK_FUNCS(setpgrp,
# We search for both crypt and crypt_r as one or the other may be defined
# This gets us our -lcrypt in LIBS when required on the target platform.
+# Save/restore LIBS to avoid linking libpython with libcrypt.
+LIBS_SAVE=$LIBS
AC_SEARCH_LIBS(crypt, crypt)
AC_SEARCH_LIBS(crypt_r, crypt)
@@ -4052,6 +4054,7 @@ char *r = crypt_r("", "", &d);
[AC_DEFINE(HAVE_CRYPT_R, 1, [Define if you have the crypt_r() function.])],
[])
)
+LIBS=$LIBS_SAVE
AC_CHECK_FUNCS(clock_gettime, [], [
AC_CHECK_LIB(rt, clock_gettime, [