[3.11] gh-80532: Do not set ipv6type when cross-compiling (GH-17956) (#113741)

(cherry picked from commit 5e1916ba1bf521d6ff9d2c553c057f3ef7008977)

Co-authored-by: Zackery Spytz <zspytz@gmail.com>
Co-authored-by: Xavier de Gaye <xdegaye@gmail.com>

diff --git a/Misc/NEWS.d/next/Build/2020-01-11-23-49-17.bpo-36351.ce8BBh.rst b/Misc/NEWS.d/next/Build/2020-01-11-23-49-17.bpo-36351.ce8BBh.rst
new file mode 100644 (file)
index 0000000..d3cfbfc
--- /dev/null
+++ b/Misc/NEWS.d/next/Build/2020-01-11-23-49-17.bpo-36351.ce8BBh.rst
@@ -0,0 +1 @@
+Do not set ipv6type when cross-compiling.

diff --git a/configure b/configure
index 86228da3ebe22fa5dbfd47f8374141a1263d0a05..cb3db60f9c23223b4a6a3e5d170379f4e234d049 100755 (executable)
--- a/configure
+++ b/configure
@@ -14673,7 +14673,7 @@ ipv6type=unknown
 ipv6lib=none
 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_n "checking ipv6 stack type... " >&6; }
        for i in inria kame linux-glibc linux-inet6 solaris toshiba v6d zeta;

diff --git a/configure.ac b/configure.ac
index 4c0d00533606cab61f0df55399d5153a8e853fe2..bbe7f891e7dd29e4193e229e8a131fea4d3c2afa 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4273,7 +4273,7 @@ ipv6type=unknown
 ipv6lib=none
 ipv6trylibc=no
 
-if test "$ipv6" = "yes"; then
+if test "$ipv6" = yes -a "$cross_compiling" = no; then
        AC_MSG_CHECKING([ipv6 stack type])
        for i in inria kame linux-glibc linux-inet6 solaris toshiba v6d zeta;
        do