traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bpo-36351: Do not set ipv6type when cross-compiling 

Co-Authored-By: Xavier de Gaye <xdegaye@gmail.com>
This commit is contained in:
Zackery Spytz 2020-01-11 23:49:44 -07:00
parent 100fafcf20
commit dc60fe77db
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Misc/NEWS.d/next/Build/2020-01-11-23-49-17.bpo-36351.ce8BBh.rst Normal file
View File

@ -0,0 +1 @@
Do not set ipv6type when cross-compiling.

3
configure vendored
View File

@ -10281,6 +10281,7 @@ fi
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
if test -n "$ac_tool_prefix"; then if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
@ -11076,7 +11077,7 @@ ipv6type=unknown
ipv6lib=none ipv6lib=none
ipv6trylibc=no ipv6trylibc=no
if test "$ipv6" = "yes"; then if test "$ipv6" = yes -a "$cross_compiling" = no; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking ipv6 stack type" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking ipv6 stack type" >&5
$as_echo_n "checking ipv6 stack type... " >&6; } $as_echo_n "checking ipv6 stack type... " >&6; }
for i in inria kame linux-glibc linux-inet6 solaris toshiba v6d zeta; for i in inria kame linux-glibc linux-inet6 solaris toshiba v6d zeta;

2
configure.ac
View File

@ -3291,7 +3291,7 @@ ipv6type=unknown
ipv6lib=none ipv6lib=none
ipv6trylibc=no ipv6trylibc=no
if test "$ipv6" = "yes"; then if test "$ipv6" = yes -a "$cross_compiling" = no; then
AC_MSG_CHECKING([ipv6 stack type]) AC_MSG_CHECKING([ipv6 stack type])
for i in inria kame linux-glibc linux-inet6 solaris toshiba v6d zeta; for i in inria kame linux-glibc linux-inet6 solaris toshiba v6d zeta;
do do