<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b72f7a1d33f5d9c1b1dcf4a17ed2b0c2b8f63361">https://github.com/macports/macports-ports/commit/b72f7a1d33f5d9c1b1dcf4a17ed2b0c2b8f63361</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new b72f7a1d33f gdal: always look for mpi variant
</span>b72f7a1d33f is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b72f7a1d33f5d9c1b1dcf4a17ed2b0c2b8f63361
</span>Author: Nicklas Larsson <n_larsson@yahoo.com>
AuthorDate: Thu Feb 6 09:35:16 2025 +0100
<span style='display:block; white-space:pre;color:#404040;'> gdal: always look for mpi variant
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This is now necessary since hdf5 and kealib are build dependents.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/72003
</span>---
gis/gdal/Portfile | 51 +++++++++++++++++----------------------------------
1 file changed, 17 insertions(+), 34 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/gdal/Portfile b/gis/gdal/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 81ac6f11ca0..c100afd9222 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/gdal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/gdal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -325,6 +325,23 @@ pre-configure {
</span> lappend worksrcpath_dirs ${worksrcpath}-${arch}
}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</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:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</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> }
if {$subport eq $name} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -734,23 +751,6 @@ subport gdal-hdf5 {
</span>
pre-configure {
set_gdal_variants
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # 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:#ffe0e0;'>- # Figure out HDF5's mpi include directory:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set mpl_include_dir ""
</span><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;'>- 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 mpich]}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$result} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 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 {$mpl_include_dir ne ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cxxflags-append ${mpl_include_dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
configure.args-replace -DGDAL_USE_HDF5=OFF -DGDAL_USE_HDF5=ON \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -774,23 +774,6 @@ subport gdal-kea {
</span>
pre-configure {
set_gdal_variants
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # 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:#ffe0e0;'>- # Figure out HDF5's mpi include directory:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set mpl_include_dir ""
</span><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;'>- 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 mpich]}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$result} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 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 {$mpl_include_dir ne ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cxxflags-append ${mpl_include_dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
configure.args-replace -DGDAL_USE_KEA=OFF -DGDAL_USE_KEA=ON \
</pre><pre style='margin:0'>
</pre>