Merge pull request #761 from kiwix/libmicrohttpd_enable_ipv6_under_wi…

…ndows Enable IPv6 in meson build of libmicrohttpd under Windows
kiwix · Oct 8, 2024 · 642f63c · 642f63c
2 parents e53edc8 + b2a756b
commit 642f63c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/kiwixbuild/dependencies/libmicrohttpd.py b/kiwixbuild/dependencies/libmicrohttpd.py
@@ -21,6 +21,7 @@ class Source(ReleaseDownload):
         patches = [
             "libmicrohttpd_meson_pkgconfig.patch",
             "libmicrohttpd_meson_timeval_tvsec_size.patch",
+            "libmicrohttpd_meson_winet6.patch",
         ]
 
     class Builder(MesonBuilder):

diff --git a/kiwixbuild/patches/libmicrohttpd_meson_winet6.patch b/kiwixbuild/patches/libmicrohttpd_meson_winet6.patch
@@ -0,0 +1,15 @@
+--- libmicrohttpd-0.9.76_orig/meson.build	2024-10-08 15:53:53.370828250 +0400
++++ libmicrohttpd-0.9.76/meson.build	2024-10-08 16:23:24.985668690 +0400
+@@ -77,7 +77,11 @@
+ endforeach
+
+ cdata.set('HAVE_ASSERT', cc.has_header_symbol('assert.h', 'assert'))
+-cdata.set10('HAVE_INET6', cc.has_header_symbol('netinet/in.h', 'struct in6_addr'))
++if host_machine.system() == 'windows'
++  cdata.set10('HAVE_INET6', 1)
++else
++  cdata.set10('HAVE_INET6', cc.has_header_symbol('netinet/in.h', 'struct in6_addr'))
++endif
+
+ functions = [
+   'accept4',