<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c6cba6835755b49b612ea59ac1a18c9a25374b58">https://github.com/macports/macports-ports/commit/c6cba6835755b49b612ea59ac1a18c9a25374b58</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit c6cba6835755b49b612ea59ac1a18c9a25374b58
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Sat Jun 5 16:26:20 2021 +0100
<span style='display:block; white-space:pre;color:#404040;'> boost PG: Add support for adding numpy dependencies if requested
</span>---
_resources/port1.0/group/boost-1.0.tcl | 23 +++++++++++++++++++----
1 file changed, 19 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/boost-1.0.tcl b/_resources/port1.0/group/boost-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 91d72e37b8f..fcc3a3a09e5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/boost-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/boost-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,6 +13,9 @@ default boost.version 1.76
</span> options boost.depends_type
default boost.depends_type lib
<span style='display:block; white-space:pre;background:#e0ffe0;'>+options boost.require_numpy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default boost.require_numpy no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> set boost_cache_version_nodot ""
set boost_cache_depends ""
set boost_cache_cpath ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,6 +45,10 @@ proc boost::lib_dir {} {
</span> return [boost::install_area]/lib
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+proc boost::depends_portname {} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return boost[boost::version_nodot]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> proc boost::configure_build {} {
global cmake.build_dir meson.build_type
global boost_cache_version_nodot boost_cache_depends boost_cache_cxxflags
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,12 +59,18 @@ proc boost::configure_build {} {
</span>
# Set the requested boost dependency
if { ${boost_cache_version_nodot} ne "" && ${boost_cache_depends} ne "" } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_${boost_cache_depends}-delete port:boost${boost_cache_version_nodot}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_${boost_cache_depends}-delete port:boost${boost_cache_version_nodot}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [option boost.require_numpy] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_${boost_cache_depends}-delete port:boost${boost_cache_version_nodot}-numpy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
set boost_cache_depends [option boost.depends_type]
set boost_cache_version_nodot [boost::version_nodot]
depends_[option boost.depends_type]-append port:boost[boost::version_nodot]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [option boost.require_numpy] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_[option boost.depends_type]-append port:boost[boost::version_nodot]-numpy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Append to the build flags to find the isolated headers/libs
if { ${boost_cache_cxxflags} ne "" } {
configure.cxxflags-delete ${boost_cache_cxxflags}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -127,6 +140,7 @@ proc boost::configure_build {} {
</span> configure.args-append ${flag}
}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> }
port::register_callback boost::configure_build
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -137,5 +151,6 @@ proc boost::set_boost_parameters {option action args} {
</span> if {$action ne "set"} return
boost::configure_build
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-option_proc boost.version boost::set_boost_parameters
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-option_proc boost.depends_type boost::set_boost_parameters
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+option_proc boost.version boost::set_boost_parameters
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+option_proc boost.depends_type boost::set_boost_parameters
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+option_proc boost.require_numpy boost::set_boost_parameters
</span></pre><pre style='margin:0'>
</pre>