upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-02-24 18:30:38 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix using sibling-root libuv for Windows builds

Browse source 
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.

(cherry picked from commit 57b430b8ca)
This commit is contained in:
Michał Kępień 2020-03-06 13:25:45 +01:00
parent 40fd6b8616
commit 11f2f7bfbf
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
win32utils/Configure
View file

@ -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