aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYury Bura <yurybura@gmail.com>2021-10-14 00:50:03 +0300
committerGitHub <noreply@github.com>2021-10-13 14:50:03 -0700
commit1f5e8e4e9b5101a04634e83ae20c147042bfafd2 (patch)
tree0dbe32d1774120a9cc7bbcb572a52f50c46c3d52
parentfa55dc6197aac9e0fd8040e1558ef7eae4148f77 (diff)
downloadvcpkg-1f5e8e4e9b5101a04634e83ae20c147042bfafd2.tar.gz
vcpkg-1f5e8e4e9b5101a04634e83ae20c147042bfafd2.zip
[boost] fix boost-mpi dependency (#20681)
* [boost] fix #20676 * update version
-rw-r--r--ports/boost/vcpkg.json6
-rw-r--r--scripts/boost/generate-ports.ps14
-rw-r--r--versions/b-/boost.json5
-rw-r--r--versions/baseline.json2
4 files changed, 11 insertions, 6 deletions
diff --git a/ports/boost/vcpkg.json b/ports/boost/vcpkg.json
index 679f1b752..9dca95aea 100644
--- a/ports/boost/vcpkg.json
+++ b/ports/boost/vcpkg.json
@@ -1,7 +1,7 @@
{
"name": "boost",
"version": "1.77.0",
- "port-version": 1,
+ "port-version": 2,
"description": "Peer-reviewed portable C++ source libraries",
"homepage": "https://boost.org",
"dependencies": [
@@ -137,7 +137,6 @@
},
"boost-program-options",
"boost-property-map",
- "boost-property-map-parallel",
"boost-property-tree",
"boost-proto",
"boost-ptr-container",
@@ -202,7 +201,8 @@
"description": "Build with MPI support",
"dependencies": [
"boost-graph-parallel",
- "boost-mpi"
+ "boost-mpi",
+ "boost-property-map-parallel"
]
}
}
diff --git a/scripts/boost/generate-ports.ps1 b/scripts/boost/generate-ports.ps1
index a626daf34..361480f04 100644
--- a/scripts/boost/generate-ports.ps1
+++ b/scripts/boost/generate-ports.ps1
@@ -24,7 +24,7 @@ else {
# Clear this array when moving to a new boost version
$portVersions = @{
#e.g. "boost-asio" = 1;
- "boost" = 1;
+ "boost" = 2;
"boost-config" = 2;
"boost-gil" = 1;
"boost-iostreams" = 1;
@@ -39,7 +39,7 @@ $portData = @{
"features" = @{
"mpi" = @{
"description" = "Build with MPI support";
- "dependencies" = @("boost-mpi", "boost-graph-parallel");
+ "dependencies" = @("boost-mpi", "boost-graph-parallel", "boost-property-map-parallel");
}
}
};
diff --git a/versions/b-/boost.json b/versions/b-/boost.json
index 4fef04531..d3f77c2ac 100644
--- a/versions/b-/boost.json
+++ b/versions/b-/boost.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "19bdc0542dd287e39768144ba2719723a7818750",
+ "version": "1.77.0",
+ "port-version": 2
+ },
+ {
"git-tree": "5fe225d8d76e70968014f7ddab050d7e520709e6",
"version": "1.77.0",
"port-version": 1
diff --git a/versions/baseline.json b/versions/baseline.json
index 10e3bea85..06e289b23 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -506,7 +506,7 @@
},
"boost": {
"baseline": "1.77.0",
- "port-version": 1
+ "port-version": 2
},
"boost-accumulators": {
"baseline": "1.77.0",