diff options
| author | niclar <niclar80@gmail.com> | 2020-11-06 22:30:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-06 13:30:37 -0800 |
| commit | 0e1252388d5353f031e177b2826bab98d6c2e21c (patch) | |
| tree | bebed137e3ec460899eafda8710bedcd25526952 /scripts | |
| parent | eeeea96d9a944e58aad4db09cb372513e96d1ec8 (diff) | |
| download | vcpkg-0e1252388d5353f031e177b2826bab98d6c2e21c.tar.gz vcpkg-0e1252388d5353f031e177b2826bab98d6c2e21c.zip | |
[boost] Update to 1.74.0 (#14089)
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/boost/generate-ports.ps1 | 26 | ||||
| -rw-r--r-- | scripts/boost/post-source-stubs/nowide.cmake | 11 |
2 files changed, 14 insertions, 23 deletions
diff --git a/scripts/boost/generate-ports.ps1 b/scripts/boost/generate-ports.ps1 index a2be1b8b3..d92ab8adf 100644 --- a/scripts/boost/generate-ports.ps1 +++ b/scripts/boost/generate-ports.ps1 @@ -1,7 +1,7 @@ [CmdletBinding()]
param (
$libraries = @(),
- $version = "1.73.0",
+ $version = "1.74.0",
$portsDir = $null
)
@@ -13,27 +13,7 @@ if ($null -eq $portsDir) # Optionally clear this array when moving to a new boost version
$port_versions = @{
- "asio" = 2;
- "beast" = 2;
- "context" = 2;
- "coroutine" = 2;
- "coroutine2" = 2;
- "fiber" = 2;
- "filesystem" = 1;
- "graph-parallel" = 1;
- "iostreams" = 1;
- "locale" = 2;
- "log" = 2;
- "mpi" = 1;
- "parameter-python" = 2;
- "poly-collection" = 1;
- "process" = 2;
- "python" = 2;
- "safe-numerics" = 1;
- "stacktrace" = 1;
- "test" = 1;
- "wave" = 1;
- "boost" = 4
+ #e.g. "asio" = 1;
}
$per_port_data = @{
@@ -159,7 +139,7 @@ function Generate() $portfileLines += @(" PATCHES")
foreach ($patch in $patches)
{
- $portfileLines += @(" $($patches.name)")
+ $portfileLines += @(" $($patch.name)")
}
}
$portfileLines += @(
diff --git a/scripts/boost/post-source-stubs/nowide.cmake b/scripts/boost/post-source-stubs/nowide.cmake new file mode 100644 index 000000000..4005c3a80 --- /dev/null +++ b/scripts/boost/post-source-stubs/nowide.cmake @@ -0,0 +1,11 @@ +file(READ "${SOURCE_PATH}/build/Jamfile.v2" _contents)
+
+string(REPLACE "import ../../config/checks/config" "import config/checks/config" _contents "${_contents}")
+
+string(REPLACE "check-target-builds cxx11_moveable_fstreams" "check-target-builds ../check_movable_fstreams.cpp" _contents "${_contents}")
+string(REPLACE "check-target-builds lfs_support" "check-target-builds ../check_lfs_support.cpp" _contents "${_contents}")
+
+file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}")
+file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/build/config")
+
+file(COPY "${SOURCE_PATH}/test/check_lfs_support.cpp" "${SOURCE_PATH}/test/check_movable_fstreams.cpp" DESTINATION "${SOURCE_PATH}/build/config")
|