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

erlend-aasland · ZackerySpytz · xdegaye · web-flow · commit 1687e85343cb · 2024-01-05T16:04:25.000Z
(cherry picked from commit 5e1916b) 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
@@ -0,0 +1 @@
+Do not set ipv6type when cross-compiling.
diff --git a/configure b/configure
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Do not set ipv6type when cross-compiling.`