<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f696597102b95b3bba21e781cb77130982385df6">https://github.com/macports/macports-ports/commit/f696597102b95b3bba21e781cb77130982385df6</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit f696597102b95b3bba21e781cb77130982385df6
</span>Author: Nicklas Larsson <n_larsson@yahoo.com>
AuthorDate: Tue Dec 19 14:27:34 2023 +0100
<span style='display:block; white-space:pre;color:#404040;'> saga: remove PG mpi, just detect path to mpi.h if hdf5 needs it
</span>---
gis/saga/Portfile | 33 ++++++++++++++-------------------
1 file changed, 14 insertions(+), 19 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/saga/Portfile b/gis/saga/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8a6de8bbebc..8e57b3807ba 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/saga/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/saga/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,8 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup active_variants 1.1
</span> PortGroup cmake 1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup mpi 1.0
</span> PortGroup wxWidgets 1.0
wxWidgets.use wxWidgets-3.2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,8 +47,6 @@ depends_lib-append port:${wxWidgets.port} \
</span> port:curl \
port:tiff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-mpi.setup
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> compiler.cxx_standard 2014
configure.pkg_config_path-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -93,26 +91,23 @@ if {![variant_isset unixodbc] && ![variant_isset iodbc]} {
</span> }
variant vigra description "Add VIGRA support" {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![catch {set result [active_variants hdf5 openmpi]}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$result} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![variant_isset openmpi]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "HDF5 has openmpi enabled, please use the same variant."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # If HDF5 is built with a mpi variant, we need to know the path to "mpi.h".
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Figure out HDF5's mpi include directory:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set mpl_include_dir ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![catch {set result [active_variants hdf5 openmpi]}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$result} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set mpl_include_dir "-I${prefix}/include/openmpi-mp"
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![catch {set result [active_variants hdf5 mpi]}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$result} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![variant_isset mpi]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "HDF5 has mpi enabled, please use the same variant."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![catch {set result [active_variants hdf5 mpich]}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$result} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set mpl_include_dir "-I${prefix}/include/mpich-mp"
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset mpich] || [variant_isset mpich-devel] || \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [variant_isset openmpi] || [variant_isset openmpi_devel]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mpi.enforce_variant hdf5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$mpl_include_dir ne ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxxflags-append ${mpl_include_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
configure.args-replace -DWITH_TOOLS_VIGRA=OFF -DWITH_TOOLS_VIGRA=ON \
</pre><pre style='margin:0'>
</pre>