mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-25 01:43:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 14

bpo-43158: Regenerate configure again (GH-29433)

Browse source
This commit is contained in:
Christian Heimes 2021-11-05 22:51:26 +02:00 • committed by GitHub
parent 60b5333fa9
commit 9b0f45c069
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

64
configure vendored
View file

@ -10159,13 +10159,15 @@ $as_echo "no" >&6; }
fi fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
# check for libuuid from util-linux
save_LIBS=$LIBS save_LIBS=$LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing uuid_generate_time_safe" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_generate_time in -luuid" >&5
$as_echo_n "checking for library containing uuid_generate_time_safe... " >&6; } $as_echo_n "checking for uuid_generate_time in -luuid... " >&6; }
if ${ac_cv_search_uuid_generate_time_safe+:} false; then : if ${ac_cv_lib_uuid_uuid_generate_time+:} false; then :
$as_echo_n "(cached) " >&6 $as_echo_n "(cached) " >&6
else else
ac_func_search_save_LIBS=$LIBS ac_check_lib_save_LIBS=$LIBS
LIBS="-luuid $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */ /* end confdefs.h. */
@ -10175,61 +10177,39 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus #ifdef __cplusplus
extern "C" extern "C"
#endif #endif
char uuid_generate_time_safe (); char uuid_generate_time ();
int int
main () main ()
{ {
return uuid_generate_time_safe (); return uuid_generate_time ();
; ;
return 0; return 0;
} }
_ACEOF _ACEOF
for ac_lib in '' uuid; do if ac_fn_c_try_link "$LINENO"; then :
if test -z "$ac_lib"; then ac_cv_lib_uuid_uuid_generate_time=yes
ac_res="none required" else
else ac_cv_lib_uuid_uuid_generate_time=no
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_search_uuid_generate_time_safe=$ac_res
fi fi
rm -f core conftest.err conftest.$ac_objext \ rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest$ac_exeext conftest.$ac_ext
if ${ac_cv_search_uuid_generate_time_safe+:} false; then : LIBS=$ac_check_lib_save_LIBS
break
fi fi
done { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_uuid_uuid_generate_time" >&5
if ${ac_cv_search_uuid_generate_time_safe+:} false; then : $as_echo "$ac_cv_lib_uuid_uuid_generate_time" >&6; }
if test "x$ac_cv_lib_uuid_uuid_generate_time" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBUUID 1
_ACEOF
else LIBS="-luuid $LIBS"
ac_cv_search_uuid_generate_time_safe=no
fi
rm conftest.$ac_ext
LIBS=$ac_func_search_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_uuid_generate_time_safe" >&5
$as_echo "$ac_cv_search_uuid_generate_time_safe" >&6; }
ac_res=$ac_cv_search_uuid_generate_time_safe
if test "$ac_res" != no; then :
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
$as_echo "#define HAVE_LIBUUID 1" >>confdefs.h
,
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi fi
LIBS=$save_LIBS LIBS=$save_LIBS
# AIX provides support for RFC4122 (uuid) in libc.a starting with AIX 6.1 (anno 2007) # AIX provides support for RFC4122 (uuid) in libc.a starting with AIX 6.1 (anno 2007)
# FreeBSD and OpenBSD provides support as well # FreeBSD and OpenBSD provides support in libc as well.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_create" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_create" >&5
$as_echo_n "checking for uuid_create... " >&6; } $as_echo_n "checking for uuid_create... " >&6; }
cat confdefs.h - <<_ACEOF >conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext

2
pyconfig.h.in
View file

@ -604,7 +604,7 @@
/* Define to 1 if you have the <libutil.h> header file. */ /* Define to 1 if you have the <libutil.h> header file. */
#undef HAVE_LIBUTIL_H #undef HAVE_LIBUTIL_H
/* Define you have libuuid. */ /* Define to 1 if you have the `uuid' library (-luuid). */
#undef HAVE_LIBUUID #undef HAVE_LIBUUID
/* Define if you have the 'link' function. */ /* Define if you have the 'link' function. */