diff --git a/win32_deps_build.sh b/win32_deps_build.sh index cc04bc5444f..5942e9cda12 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://boostorg.jfrog.io/artifactory/main/release/1.73.0/source/boost_1_73_0.tar.gz" -boostSrcDir="${depsSrcDir}/boost_1_73_0" +boostUrl="https://boostorg.jfrog.io/artifactory/main/release/1.75.0/source/boost_1_75_0.tar.gz" +boostSrcDir="${depsSrcDir}/boost_1_75_0" boostDir="${depsToolsetDir}/boost" zlibDir="${depsToolsetDir}/zlib" zlibSrcDir="${depsSrcDir}/zlib" @@ -196,122 +196,6 @@ patch -N boost/thread/pthread/thread_data.hpp < -+#elif defined(BOOST_ASIO_HAS_PTHREADS) -+# include - #elif defined(BOOST_ASIO_WINDOWS) - # if defined(UNDER_CE) - # include -@@ -27,8 +29,6 @@ - # else - # include - # endif --#elif defined(BOOST_ASIO_HAS_PTHREADS) --# include - #elif defined(BOOST_ASIO_HAS_STD_THREAD) - # include - #else -@@ -41,6 +41,8 @@ - - #if !defined(BOOST_ASIO_HAS_THREADS) - typedef null_thread thread; -+#elif defined(BOOST_ASIO_HAS_PTHREADS) -+typedef posix_thread thread; - #elif defined(BOOST_ASIO_WINDOWS) - # if defined(UNDER_CE) - typedef wince_thread thread; -@@ -49,8 +51,6 @@ - # else - typedef win_thread thread; - # endif --#elif defined(BOOST_ASIO_HAS_PTHREADS) --typedef posix_thread thread; - #elif defined(BOOST_ASIO_HAS_STD_THREAD) - typedef std_thread thread; - #endif -EOL - -# Unix socket support for Windows is currently disabled by Boost. -# https://github.com/huangqinjin/asio/commit/d27a8ad1870 -patch -N boost/asio/detail/socket_types.hpp <=1.75, it's unreleased as of 1.74. -patch -N boost/process/detail/windows/handle_workaround.hpp <