From: Lucian Petrut <lpetrut@cloudbasesolutions.com>
Date: Wed, 11 Nov 2020 07:35:44 +0000 (+0000)
Subject: win32*.sh: bump win32 boost dependency
X-Git-Tag: v16.1.0~138^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a07251753aa57edc8bb3df23ca1ba1be45000a32;p=ceph.git

win32*.sh: bump win32 boost dependency

Ceph now requires boost>=1.72. We're going to update the Windows
build script accordingly.

There's been one Boost regression for which we have to cherry-pick
a patch that hasn't been released yet.

Signed-off-by: Lucian Petrut <lpetrut@cloudbasesolutions.com>
---

diff --git a/win32_deps_build.sh b/win32_deps_build.sh
index dbff416b1fda..c2ec969e2bd4 100755
--- a/win32_deps_build.sh
+++ b/win32_deps_build.sh
@@ -24,8 +24,8 @@ curlSrcDir="${depsSrcDir}/curl"
 curlDir="${depsToolsetDir}/curl"
 
 # For now, we'll keep the version number within the file path when not using git.
-boostUrl="https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_70_0.tar.gz"
-boostSrcDir="${depsSrcDir}/boost_1_70_0"
+boostUrl="https://dl.bintray.com/boostorg/release/1.73.0/source/boost_1_73_0.tar.gz"
+boostSrcDir="${depsSrcDir}/boost_1_73_0"
 boostDir="${depsToolsetDir}/boost"
 zlibDir="${depsToolsetDir}/zlib"
 zlibSrcDir="${depsSrcDir}/zlib"
@@ -258,6 +258,45 @@ patch -N boost/asio/detail/config.hpp <<EOL
  #endif // !defined(BOOST_ASIO_HAS_LOCAL_SOCKETS)
 EOL
 
+# TODO: drop this when switching to Boost>=1.75, it's unreleased as of 1.74.
+patch -N boost/process/detail/windows/handle_workaround.hpp <<EOL
+--- boost/process/detail/windows/handle_workaround.hpp
++++ boost/process/detail/windows/handle_workaround.hpp.new
+@@ -198,20 +198,20 @@ typedef struct _OBJECT_TYPE_INFORMATION_ {
+ 
+ 
+ /*
+-__kernel_entry NTSTATUS NtQuerySystemInformation(
++NTSTATUS NtQuerySystemInformation(
+   IN SYSTEM_INFORMATION_CLASS SystemInformationClass,
+   OUT PVOID                   SystemInformation,
+   IN ULONG                    SystemInformationLength,
+   OUT PULONG                  ReturnLength
+ );
+  */
+-typedef ::boost::winapi::NTSTATUS_ (__kernel_entry *nt_system_query_information_p )(
++typedef ::boost::winapi::NTSTATUS_ (*nt_system_query_information_p )(
+         SYSTEM_INFORMATION_CLASS_,
+         void *,
+         ::boost::winapi::ULONG_,
+         ::boost::winapi::PULONG_);
+ /*
+-__kernel_entry NTSYSCALLAPI NTSTATUS NtQueryObject(
++NTSYSCALLAPI NTSTATUS NtQueryObject(
+   HANDLE                   Handle,
+   OBJECT_INFORMATION_CLASS ObjectInformationClass,
+   PVOID                    ObjectInformation,
+@@ -220,7 +220,7 @@ __kernel_entry NTSYSCALLAPI NTSTATUS NtQueryObject(
+ );
+  */
+ 
+-typedef ::boost::winapi::NTSTATUS_ (__kernel_entry *nt_query_object_p )(
++typedef ::boost::winapi::NTSTATUS_ (*nt_query_object_p )(
+         ::boost::winapi::HANDLE_,
+         OBJECT_INFORMATION_CLASS_,
+         void *,
+EOL
+
 ./bootstrap.sh
 
 ./b2 install --user-config=user-config.jam toolset=gcc-mingw32 \