aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhoebe <20694052+PhoebeHui@users.noreply.github.com>2021-09-24 08:54:30 +0800
committerGitHub <noreply@github.com>2021-09-23 17:54:30 -0700
commite6256745c670776ca0dcf8de3e00f6503820b0df (patch)
treead51ce9ce24ad5e85c552e577561824f44667a08
parente583724611de1a5f28fdeb0724918d29f86e9c1e (diff)
downloadvcpkg-e6256745c670776ca0dcf8de3e00f6503820b0df.tar.gz
vcpkg-e6256745c670776ca0dcf8de3e00f6503820b0df.zip
[openmpi] Disable fortran mpi bindings explicitly (#20300)
-rw-r--r--ports/openmpi/portfile.cmake5
-rw-r--r--ports/openmpi/vcpkg.json2
-rw-r--r--versions/baseline.json2
-rw-r--r--versions/o-/openmpi.json5
4 files changed, 10 insertions, 4 deletions
diff --git a/ports/openmpi/portfile.cmake b/ports/openmpi/portfile.cmake
index 3b926e6d1..435333480 100644
--- a/ports/openmpi/portfile.cmake
+++ b/ports/openmpi/portfile.cmake
@@ -15,7 +15,7 @@ vcpkg_extract_source_archive_ex(
OUT_SOURCE_PATH SOURCE_PATH
ARCHIVE ${ARCHIVE}
PATCHES
- keep_isystem.patch
+ keep_isystem.patch
)
vcpkg_find_acquire_program(PERL)
@@ -28,6 +28,7 @@ vcpkg_configure_make(
OPTIONS
--with-hwloc=internal
--with-libevent=internal
+ --disable-mpi-fortran
OPTIONS_DEBUG
--enable-debug
)
@@ -37,4 +38,4 @@ vcpkg_install_make(DISABLE_PARALLEL)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/openmpi/vcpkg.json b/ports/openmpi/vcpkg.json
index 96fae3a06..fe5d44c18 100644
--- a/ports/openmpi/vcpkg.json
+++ b/ports/openmpi/vcpkg.json
@@ -1,7 +1,7 @@
{
"name": "openmpi",
"version-string": "4.1.0",
- "port-version": 1,
+ "port-version": 2,
"description": "The Open MPI Project is an open source Message Passing Interface implementation that is developed and maintained by a consortium of academic, research, and industry partners. Open MPI is therefore able to combine the expertise, technologies, and resources from all across the High Performance Computing community in order to build the best MPI library available. Open MPI offers advantages for system and software vendors, application developers and computer science researchers.",
"homepage": "https://www.open-mpi.org/",
"supports": "!(windows | uwp)"
diff --git a/versions/baseline.json b/versions/baseline.json
index ce1711e3b..101be86ce 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4826,7 +4826,7 @@
},
"openmpi": {
"baseline": "4.1.0",
- "port-version": 1
+ "port-version": 2
},
"openmvg": {
"baseline": "1.6",
diff --git a/versions/o-/openmpi.json b/versions/o-/openmpi.json
index aaa382971..836cc592b 100644
--- a/versions/o-/openmpi.json
+++ b/versions/o-/openmpi.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "2c4b5b526fe4b6a8de9fa88eea30d3a1ddc7878e",
+ "version-string": "4.1.0",
+ "port-version": 2
+ },
+ {
"git-tree": "bcc3284d0c3730ee4237efff0cd32df0be272d8e",
"version-string": "4.1.0",
"port-version": 1