From 1687e85343cb35410d3c12495856501787926db0 Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Fri, 5 Jan 2024 17:04:25 +0100 Subject: [PATCH] [3.11] gh-80532: Do not set ipv6type when cross-compiling (GH-17956) (#113741) (cherry picked from commit 5e1916ba1bf521d6ff9d2c553c057f3ef7008977) Co-authored-by: Zackery Spytz Co-authored-by: Xavier de Gaye --- Misc/NEWS.d/next/Build/2020-01-11-23-49-17.bpo-36351.ce8BBh.rst | 1 + configure | 2 +- configure.ac | 2 +- 3 files changed, 3 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 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 86228da3ebe2..cb3db60f9c23 100755 --- 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 4c0d00533606..bbe7f891e7dd 100644 --- 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 -- 2.47.3