diff options
| author | Stefano Sinigardi <stesinigardi@hotmail.com> | 2019-10-07 19:35:13 +0200 |
|---|---|---|
| committer | Curtis J Bezault <curtbezault@gmail.com> | 2019-10-07 10:35:13 -0700 |
| commit | 726c11148105a97aef39bec024fdb7c140b1b154 (patch) | |
| tree | 26bd2aee0c13a8351b259cc4ffffaf0efededb4e /scripts/boost | |
| parent | e86ff2cc54bda9e9ee322ab69141e7113d5c40a9 (diff) | |
| download | vcpkg-726c11148105a97aef39bec024fdb7c140b1b154.tar.gz vcpkg-726c11148105a97aef39bec024fdb7c140b1b154.zip | |
[vcpkg] fatal_error when patch fails to apply (#8087)
vcpkg will now fail on failure to apply patches except when using `--head`.
Diffstat (limited to 'scripts/boost')
| -rw-r--r-- | scripts/boost/generate-ports.ps1 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/boost/generate-ports.ps1 b/scripts/boost/generate-ports.ps1 index d51b37f7e..5f5897718 100644 --- a/scripts/boost/generate-ports.ps1 +++ b/scripts/boost/generate-ports.ps1 @@ -13,9 +13,9 @@ function TransformReference() [string]$library
)
- if ($library -match "python|fiber")
+ if ($library -match "fiber")
{
- # These two only work on windows desktop
+ # these only work on windows desktop
"$library (windows)"
}
elseif ($library -match "type[_-]erasure|contract")
@@ -47,12 +47,12 @@ function Generate() $sanitizedName = $name -replace "_","-"
$versionsuffix = ""
- if ($Name -eq "python" -or $Name -eq "asio" -or $Name -eq "mpi")
+ if ($Name -eq "asio" -or $Name -eq "mpi")
{
$versionsuffix = "-1"
}
- if ($Name -eq "test")
+ if ($Name -eq "python" -or $Name -eq "test")
{
$versionsuffix = "-2"
}
@@ -363,7 +363,7 @@ foreach ($library in $libraries) if ($library -eq "python")
{
- $deps += @("python3")
+ $deps += @("python3 (!osx&!linux)")
$needsBuild = $true
}
elseif ($library -eq "iostreams")
|