From dc60fe77dbdea85205aadcae2d323ef996297485 Mon Sep 17 00:00:00 2001
From: Zackery Spytz <zspytz@gmail.com>
Date: Sat, 11 Jan 2020 23:49:44 -0700
Subject: [PATCH 1/2] bpo-36351: Do not set ipv6type when cross-compiling

Co-Authored-By: Xavier de Gaye <xdegaye@gmail.com>
---
 .../NEWS.d/next/Build/2020-01-11-23-49-17.bpo-36351.ce8BBh.rst | 1 +
 configure                                                      | 3 ++-
 configure.ac                                                   | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 Misc/NEWS.d/next/Build/2020-01-11-23-49-17.bpo-36351.ce8BBh.rst

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 00000000000000..d3cfbfc7ea1000
--- /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 a2c7ddf595db2a..057cc4acb1644a 100755
--- a/configure
+++ b/configure
@@ -10281,6 +10281,7 @@ fi
 
 
 
+
 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; 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.
@@ -11076,7 +11077,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 57dca35723c67b..68529bee9319dc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3291,7 +3291,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

From a6d89925a4d4a697cc66b29c52fe14f92db87a1f Mon Sep 17 00:00:00 2001
From: "Erlend E. Aasland" <erlend@python.org>
Date: Fri, 5 Jan 2024 15:57:23 +0100
Subject: [PATCH 2/2] Regen configure

---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index 3cc9aecafad13e..b1153df4d7ec52 100755
--- a/configure
+++ b/configure
@@ -16538,7 +16538,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;