mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-05 09:41:28 +08:00
56 lines
1.7 KiB
Diff
56 lines
1.7 KiB
Diff
From f2c5695f17ec59f4badd374daabccf362bbd5f24 Mon Sep 17 00:00:00 2001
|
|
From: Billy Robert O'Neal III <bion@microsoft.com>
|
|
Date: Wed, 26 Apr 2023 05:17:22 +0000
|
|
Subject: [PATCH 13/14] configure no libcrypt
|
|
|
|
---
|
|
configure | 3 +++
|
|
configure.ac | 3 +++
|
|
2 files changed, 6 insertions(+)
|
|
|
|
diff --git a/configure b/configure
|
|
index bad619963a..c443360280 100755
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -13239,6 +13239,8 @@ done
|
|
|
|
# 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
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing crypt" >&5
|
|
$as_echo_n "checking for library containing crypt... " >&6; }
|
|
if ${ac_cv_search_crypt+:} false; then :
|
|
@@ -13380,6 +13382,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
|
|
fi
|
|
|
|
+LIBS=$LIBS_SAVE
|
|
|
|
for ac_func in clock_gettime
|
|
do :
|
|
diff --git a/configure.ac b/configure.ac
|
|
index cc69015b10..a6c72c1014 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -4056,6 +4056,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)
|
|
|
|
@@ -4070,6 +4072,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, [
|
|
--
|
|
2.25.1
|
|
|