From: Michał Kępień <michal@isc.org>
Date: Fri, 6 Mar 2020 12:25:45 +0000 (+0100)
Subject: Fix using sibling-root libuv for Windows builds
X-Git-Tag: v9.17.1~70^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=57b430b8cad93a34cbd25378f2f0d3bb6efec182;p=thirdparty%2Fbind9.git

Fix using sibling-root libuv for Windows builds

HAVE_UV_IMPORT and other config.h macros must not be set unconditionally
because no existing libuv release exposes uv_import() and/or uv_export()
yet.  Windows builds not passing an explicit path to libuv to
win32utils/Configure are currently broken because of this, so comment
out the offending lines and describe when the aforementioned config.h
macros should be set.
---

diff --git a/win32utils/Configure b/win32utils/Configure
index 6bd8ce4fed6..22e425b83a4 100644
--- a/win32utils/Configure
+++ b/win32utils/Configure
@@ -1324,15 +1324,18 @@ if ($use_libuv eq "auto") {
             last;
         }
     }
-    $configdefh{"HAVE_UV_HANDLE_SET_DATA"} = 1;
-    $configdefh{"HAVE_UV_HANDLE_GET_DATA"} = 1;
-    $configdefh{"HAVE_UV_IMPORT"} = 1;
-
 
     # If we have one use it otherwise report the error
     if ($use_libuv eq "auto") {
         die "can't find an libuv built directory at sibling root\n";
     }
+
+    # When a libuv version exposing uv_import() and uv_export() is released, the
+    # following three config.h macros will need to be conditionally defined for
+    # that libuv version and all later ones.
+    # $configdefh{"HAVE_UV_HANDLE_SET_DATA"} = 1;
+    # $configdefh{"HAVE_UV_HANDLE_GET_DATA"} = 1;
+    # $configdefh{"HAVE_UV_IMPORT"} = 1;
 }
 # falls into (so no else)
 if ($use_libuv eq "yes") {
@@ -1359,6 +1362,12 @@ if ($use_libuv eq "yes") {
     $configinc{"LIBUV_INC"} = "$libuv_inc";
     $configlib{"LIBUV_LIB"} = "$libuv_lib";
     $configdll{"LIBUV_DLL"} = "$libuv_dll";
+    # When a libuv version exposing uv_import() and uv_export() is released, the
+    # following three config.h macros will need to be conditionally defined for
+    # that libuv version and all later ones.
+    # $configdefh{"HAVE_UV_HANDLE_SET_DATA"} = 1;
+    # $configdefh{"HAVE_UV_HANDLE_GET_DATA"} = 1;
+    # $configdefh{"HAVE_UV_IMPORT"} = 1;
 }
 
 # with-openssl