Merge branch 'fix-compilation-without-ipv6' into 'master'

support compilation without ipv6

See merge request redox-os/redox!2176
This commit is contained in:
sourceturner 2026-06-04 11:14:16 +00:00
commit 0b8849fbb9
4 changed files with 43 additions and 1 deletions

View File

@ -0,0 +1,29 @@
diff --git a/lib/asyn-thrdd.c b/lib/asyn-thrdd.c
index 90f055c2..4db5ab02 100644
--- a/lib/asyn-thrdd.c
+++ b/lib/asyn-thrdd.c
@@ -481,7 +481,11 @@ static void async_thrdd_report_item(struct Curl_easy *data,
struct dynbuf tmp;
const char *sep = "";
const struct Curl_addrinfo *ai = item->res;
+#ifdef USE_IPV6
int ai_family = (item->dns_queries & CURL_DNSQ_AAAA) ? AF_INET6 : AF_INET;
+#else
+ int ai_family = AF_INET;
+#endif
CURLcode result;
if(!CURL_TRC_DNS_is_verbose(data))
@@ -789,10 +793,12 @@ const struct Curl_addrinfo *Curl_async_get_ai(struct Curl_easy *data,
if(thrdd->res_A)
return async_thrdd_get_ai(thrdd->res_A->res, ai_family, index);
break;
+#ifdef USE_IPV6
case AF_INET6:
if(thrdd->res_AAAA)
return async_thrdd_get_ai(thrdd->res_AAAA->res, ai_family, index);
break;
+#endif
default:
break;
}

View File

@ -1,7 +1,7 @@
[source]
git = "https://github.com/curl/curl.git"
rev = "curl-8_20_0"
patches = ["redox.patch"]
patches = ["ipv6.patch", "redox.patch"]
shallow_clone = true
[build]

View File

@ -0,0 +1,12 @@
diff '--color=always' -Naur a/netsurf/utils/config.h b/netsurf/utils/config.h
--- a/netsurf/utils/config.h 2026-06-03 23:50:18.641104799 +0000
+++ b/netsurf/utils/config.h 2026-06-03 23:53:51.866091024 +0000
@@ -200,4 +200,8 @@
#define NO_IPV6
#endif
+#ifndef AF_INET6
+ #define NO_IPV6
+#endif
+
#endif

View File

@ -2,6 +2,7 @@
tar = "https://download.netsurf-browser.org/netsurf/releases/source-full/netsurf-all-3.11.tar.gz"
blake3 = "cd406668a9ed5712efac1a8685125b83626690b73bbc6cb5de82ef00e3f65087"
patches = [
"./ipv6.patch",
"./01_redox.patch"
]