diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/boost/generate-ports.ps1 | 16 | ||||
| -rw-r--r-- | scripts/boost/post-source-stubs/json.cmake | 7 |
2 files changed, 19 insertions, 4 deletions
diff --git a/scripts/boost/generate-ports.ps1 b/scripts/boost/generate-ports.ps1 index 499a09dee..f863d8811 100644 --- a/scripts/boost/generate-ports.ps1 +++ b/scripts/boost/generate-ports.ps1 @@ -28,9 +28,11 @@ else $port_versions = @{
#e.g. "asio" = 1;
"asio" = 1;
- "python" = 2;
- "context" = 2;
+ "python" = 3;
+ "context" = 3;
"concept-check" = 2;
+ "regex" = 2;
+ "json" = 1;
}
$per_port_data = @{
@@ -291,7 +293,13 @@ foreach ($library in $libraries) "Downloading boost/$library..."
& $curl -L "https://github.com/boostorg/$library/archive/boost-$version.tar.gz" --output "$scriptsDir/downloads/$library-boost-$version.tar.gz"
}
- $hash = & $vcpkg hash $archive
+ $hash = & $vcpkg --x-wait-for-lock hash $archive
+ # remove prefix "Waiting to take filesystem lock on <path>/.vcpkg-root... "
+ if($hash -is [Object[]])
+ {
+ $hash = $hash[1]
+ }
+
$unpacked = "$scriptsDir/libs/$library-boost-$version"
if (!(Test-Path $unpacked))
{
@@ -405,7 +413,7 @@ foreach ($library in $libraries) $deps += @("boost-vcpkg-helpers")
$needsBuild = $false
- if ((Test-Path $unpacked/build/Jamfile.v2) -and $library -ne "metaparse" -and $library -ne "graph_parallel")
+ if (((Test-Path $unpacked/build/Jamfile.v2) -or (Test-Path $unpacked/build/Jamfile)) -and $library -notmatch "(metaparse|graph_parallel|function_types)")
{
$deps += @(
@{ name="boost-build"; host=$True },
diff --git a/scripts/boost/post-source-stubs/json.cmake b/scripts/boost/post-source-stubs/json.cmake new file mode 100644 index 000000000..698c7060a --- /dev/null +++ b/scripts/boost/post-source-stubs/json.cmake @@ -0,0 +1,7 @@ +# see https://github.com/boostorg/json/issues/556 fore more details
+vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile" "import ../../config/checks/config" "import config/checks/config")
+vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile" "\n <library>/boost//container/<warnings-as-errors>off" "")
+
+vcpkg_replace_string("${SOURCE_PATH}/Jamfile" "import ../config/checks/config" "import build/config/checks/config")
+
+file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/build/config")
|