Kaydet (Commit) cd18e788 authored tarafından Charles-François Natali's avatar Charles-François Natali

Issue #16836: Enable IPv6 support even if IPv6 is disabled on the build host.

...@@ -601,6 +601,8 @@ Extension Modules ...@@ -601,6 +601,8 @@ Extension Modules
Tests Tests
----- -----
- Issue #16836: Enable IPv6 support even if IPv6 is disabled on the build host.
- Issue #16748: test_heapq now works with unittest test discovery. - Issue #16748: test_heapq now works with unittest test discovery.
- Issue #10646: Tests rearranged for os.samefile/samestat to check for not - Issue #10646: Tests rearranged for os.samefile/samestat to check for not
......
...@@ -9795,28 +9795,20 @@ $as_echo "yes" >&6; } ...@@ -9795,28 +9795,20 @@ $as_echo "yes" >&6; }
esac esac
else else
if test "$cross_compiling" = yes; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
ipv6=no
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */ /* end confdefs.h. */
/* AF_INET6 available check */ /* AF_INET6 available check */
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
main() int
main ()
{ {
if (socket(AF_INET6, SOCK_STREAM, 0) < 0) int domain = AF_INET6;
exit(1); ;
else return 0;
exit(0);
} }
_ACEOF _ACEOF
if ac_fn_c_try_run "$LINENO"; then : if ac_fn_c_try_compile "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; } $as_echo "yes" >&6; }
...@@ -9829,10 +9821,7 @@ $as_echo "no" >&6; } ...@@ -9829,10 +9821,7 @@ $as_echo "no" >&6; }
ipv6=no ipv6=no
fi fi
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
if test "$ipv6" = "yes"; then if test "$ipv6" = "yes"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if RFC2553 API is available" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if RFC2553 API is available" >&5
......
...@@ -2501,25 +2501,15 @@ AC_ARG_ENABLE(ipv6, ...@@ -2501,25 +2501,15 @@ AC_ARG_ENABLE(ipv6,
[ [
dnl the check does not work on cross compilation case... dnl the check does not work on cross compilation case...
AC_RUN_IFELSE([AC_LANG_SOURCE([[ /* AF_INET6 available check */ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ /* AF_INET6 available check */
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>]],
main() [[int domain = AF_INET6;]])],[
{
if (socket(AF_INET6, SOCK_STREAM, 0) < 0)
exit(1);
else
exit(0);
}
]])],[
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
ipv6=yes ipv6=yes
],[ ],[
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
ipv6=no ipv6=no
],[
AC_MSG_RESULT(no)
ipv6=no
]) ])
if test "$ipv6" = "yes"; then if test "$ipv6" = "yes"; then
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment