diff options
| author | ras0219 <533828+ras0219@users.noreply.github.com> | 2021-03-26 12:55:34 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-26 12:55:34 -0700 |
| commit | b5bb1511f0a07be530e0bde3ae098eb3d8e83e68 (patch) | |
| tree | 62f7ed43202e512d28ac92fb2be768283f62dee9 /scripts/boost | |
| parent | 6a63ecae92e3eb26ae596e5c4ddf527f045803a4 (diff) | |
| download | vcpkg-b5bb1511f0a07be530e0bde3ae098eb3d8e83e68.tar.gz vcpkg-b5bb1511f0a07be530e0bde3ae098eb3d8e83e68.zip | |
[many ports] Apply host dependencies (#16479)
* [vcpkg] Add VCPKG_HOST_TRIPLET. Improve vcpkg.schema.json
* [many ports] Apply host dependencies
* [yasm-tool] Revert yasm-tool changes to split into PR #16478
* [many ports] Add versions
* [vcpkg.cmake] Revert change applied in other PR
* [boost-modular-build-helper] Merge from master
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Diffstat (limited to 'scripts/boost')
| -rw-r--r-- | scripts/boost/generate-ports.ps1 | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/scripts/boost/generate-ports.ps1 b/scripts/boost/generate-ports.ps1 index f3620aa73..499a09dee 100644 --- a/scripts/boost/generate-ports.ps1 +++ b/scripts/boost/generate-ports.ps1 @@ -28,7 +28,9 @@ else $port_versions = @{
#e.g. "asio" = 1;
"asio" = 1;
- "python" = 1;
+ "python" = 2;
+ "context" = 2;
+ "concept-check" = 2;
}
$per_port_data = @{
@@ -112,6 +114,11 @@ function Generate() {
$controlLines["port-version"] = $port_versions[$PortName]
}
+ elseif ($NeedsBuild)
+ {
+ # This can be removed on next update; this is used to track the host dependencies change
+ $controlLines["port-version"] = 1
+ }
if ($per_port_data[$PortName])
{
@@ -170,7 +177,10 @@ function Generate() if ($NeedsBuild)
{
$portfileLines += @(
- "include(`${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)"
+ "if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR)"
+ " message(FATAL_ERROR `"boost-$PortName requires a newer version of vcpkg in order to build.`")"
+ "endif()"
+ "include(`${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)"
)
# b2-options.cmake contains port-specific build options
if (Test-Path "$portsDir/boost-$PortName/b2-options.cmake")
@@ -397,7 +407,10 @@ foreach ($library in $libraries) $needsBuild = $false
if ((Test-Path $unpacked/build/Jamfile.v2) -and $library -ne "metaparse" -and $library -ne "graph_parallel")
{
- $deps += @("boost-build", "boost-modular-build-helper")
+ $deps += @(
+ @{ name="boost-build"; host=$True },
+ @{ name="boost-modular-build-helper"; host=$True }
+ )
$needsBuild = $true
}
|