aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilles Grospellier <63445205+grospelliergilles@users.noreply.github.com>2021-04-29 02:39:30 +0200
committerGitHub <noreply@github.com>2021-04-28 17:39:30 -0700
commit2a90d45fad8ae949233eca16946d1e9942bd8f22 (patch)
treef98fcf6d601348f6c999045201c943e6650f9a48
parent5db5b34a05f5c4dd8755c515eaed25ba978ac92c (diff)
downloadvcpkg-2a90d45fad8ae949233eca16946d1e9942bd8f22.tar.gz
vcpkg-2a90d45fad8ae949233eca16946d1e9942bd8f22.zip
[parmetis] Fix build on x64-linux. (#17410)
* Fix parmetis build on x64-linux. - Change 'METIS' directory to 'metis' because the true name is 'metis'. - Remove the non working (on linux) link 'METIS' to 'metis'. - Use absolute path for GKLIB_PATH. Using relative path does not work for test HAVE_THREADLOCALSTORAGE in metis/GKlib/GKlibSystem.cmake * Update parmetis version in baseline. * Update CONTROL file * Apply reviewer comment. * Update ci-baseline.txt * Update hash in parmetis.json. * Update port version instead of package version. * Update hash version * Try to build parmetis on 'osx'.
-rw-r--r--ports/parmetis/CONTROL3
-rw-r--r--ports/parmetis/fix-root-cmakelist-2.patch18
-rw-r--r--ports/parmetis/portfile.cmake1
-rw-r--r--scripts/ci.baseline.txt2
-rw-r--r--versions/baseline.json4
-rw-r--r--versions/p-/parmetis.json5
6 files changed, 28 insertions, 5 deletions
diff --git a/ports/parmetis/CONTROL b/ports/parmetis/CONTROL
index c98d4869f..7ef872fac 100644
--- a/ports/parmetis/CONTROL
+++ b/ports/parmetis/CONTROL
@@ -1,5 +1,6 @@
Source: parmetis
-Version: 4.0.3-3
+Version: 4.0.3
+Port-Version: 4
Homepage: https://glaros.dtc.umn.edu/gkhome/metis/parmetis/overview
Description: Parallel Graph Partitioning and Fill-reducing Matrix Ordering
Build-Depends: metis, mpi
diff --git a/ports/parmetis/fix-root-cmakelist-2.patch b/ports/parmetis/fix-root-cmakelist-2.patch
new file mode 100644
index 000000000..8f4630bfa
--- /dev/null
+++ b/ports/parmetis/fix-root-cmakelist-2.patch
@@ -0,0 +1,18 @@
+--- a/CMakeLists.txt 2013-03-30 17:24:50.000000000 +0100
++++ b/CMakeLists.txt 2021-04-20 10:41:49.946801222 +0200
+@@ -1,12 +1,12 @@
+ cmake_minimum_required(VERSION 2.8)
+ project(ParMETIS)
+
+-set(GKLIB_PATH METIS/GKlib CACHE PATH "path to GKlib")
+-set(METIS_PATH METIS CACHE PATH "path to METIS")
++set(GKLIB_PATH ${CMAKE_CURRENT_SOURCE_DIR}/metis/GKlib CACHE PATH "path to GKlib")
++set(METIS_PATH metis CACHE PATH "path to METIS")
+
+ # Symlink ./metis to wherever metis is. This allows files to be
+ # included from metis/libmetis/.
+-execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ${METIS_PATH} metis)
++#execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ${METIS_PATH} metis)
+
+ # Search for MPI.
+ # GK commented this out as it seems to be creating problems
diff --git a/ports/parmetis/portfile.cmake b/ports/parmetis/portfile.cmake
index a7558a877..62d633eac 100644
--- a/ports/parmetis/portfile.cmake
+++ b/ports/parmetis/portfile.cmake
@@ -16,6 +16,7 @@ vcpkg_extract_source_archive_ex(
fix-root-cmakelist.patch
fix-libparmetis-cmakelist.patch
use_stdint.patch
+ fix-root-cmakelist-2.patch
)
vcpkg_configure_cmake(
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index ea3edfee1..f0b12d494 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -1224,8 +1224,6 @@ orocos-kdl:x64-uwp=fail
paho-mqtt:arm-uwp=fail
paho-mqtt:x64-uwp=fail
pangomm:arm64-windows=fail
-parmetis:x64-linux=fail
-parmetis:x64-osx=fail
pdal:x64-linux=fail
pdal:x64-osx=fail
pdal-c:x64-windows-static=fail
diff --git a/versions/baseline.json b/versions/baseline.json
index a9de8877e..faceac72f 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4661,8 +4661,8 @@
"port-version": 3
},
"parmetis": {
- "baseline": "4.0.3-3",
- "port-version": 0
+ "baseline": "4.0.3",
+ "port-version": 4
},
"parquet": {
"baseline": "0",
diff --git a/versions/p-/parmetis.json b/versions/p-/parmetis.json
index d7c010c70..73965feaa 100644
--- a/versions/p-/parmetis.json
+++ b/versions/p-/parmetis.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "b472eb73edfdb744f44ec306ebf05649c7f5fb70",
+ "version-string": "4.0.3",
+ "port-version": 4
+ },
+ {
"git-tree": "3e1e3d50f531e207194d13af392a811f2af09d8b",
"version-string": "4.0.3-3",
"port-version": 0