From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Fri, 5 Jan 2024 15:56:43 +0000 (+0100)
Subject: [3.12] gh-80532: Do not set ipv6type when cross-compiling (GH-17956) (#113740)
X-Git-Tag: v3.12.2~220
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=99d8dfd43003c33d0235ece2feb5b3dd94fdc8e1;p=thirdparty%2FPython%2Fcpython.git

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

(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
index 000000000000..d3cfbfc7ea10
--- /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 02cb43163950..e962a6aed12d 100755
--- a/configure
+++ b/configure
@@ -16947,7 +16947,7 @@ ipv6type=unknown
 ipv6lib=none
 ipv6trylibc=no
 
-if test "$ipv6" = "yes"; then
+if test "$ipv6" = yes -a "$cross_compiling" = no; then
 	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking ipv6 stack type" >&5
 printf %s "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 49475ad3e998..384718db1f08 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4540,7 +4540,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