<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6c5899d96ec9d873b7a1e4f31e5a4bfc176083e6">https://github.com/macports/macports-ports/commit/6c5899d96ec9d873b7a1e4f31e5a4bfc176083e6</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 6c5899d96ec9d873b7a1e4f31e5a4bfc176083e6
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Thu Dec 29 21:37:17 2022 -0700
<span style='display:block; white-space:pre;color:#404040;'> muniversal 1.1 PG: add dependency in callback proc
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> By being in a callback procedure, it is harder to overwrite the
</span><span style='display:block; white-space:pre;color:#404040;'> dependency in the Portfile.
</span>---
_resources/port1.0/group/muniversal-1.1.tcl | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/muniversal-1.1.tcl b/_resources/port1.0/group/muniversal-1.1.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 746f1936006..0a568ef59f7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/muniversal-1.1.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/muniversal-1.1.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,12 +41,6 @@ default muniversal.dont_diff {}
</span> # utilites
##########################################################################################
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[option universal_possible] && [variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [option os.platform] eq "darwin" && [option os.major] >= 22 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:diffutils-for-muniversal
</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;'>-
</span> # allow `foreach arch ${muniversal.architectures} { ... }` to be used regardless of whether +universal set or not
options muniversal.architectures
default muniversal.architectures {[expr {[option universal_possible] && [variant_isset universal] ? ${configure.universal_archs} : ${configure.build_arch}}]}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1037,5 +1031,11 @@ proc muniversal::add_compiler_flags {} {
</span> configure.${tool}-append {*}[option configure.${tool}_archflags.[option configure.build_arch]]
}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[option universal_possible] && [variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [option os.platform] eq "darwin" && [option os.major] >= 22 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:diffutils-for-muniversal
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
port::register_callback muniversal::add_compiler_flags
</pre><pre style='margin:0'>
</pre>