<pre style='margin:0'>
Ryan Carsten Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/fca6628634e2fd164f74fa3af6a4091eda86db55">https://github.com/macports/macports-ports/commit/fca6628634e2fd164f74fa3af6a4091eda86db55</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit fca6628634e2fd164f74fa3af6a4091eda86db55
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Wed Apr 17 04:01:15 2024 -0500
<span style='display:block; white-space:pre;color:#404040;'> meson pg: Simplify meson::get_post_args
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Make meson::get_post_args return a list not a string and streamline the
</span><span style='display:block; white-space:pre;color:#404040;'> code so that the same arguments are not listed repeatedly.
</span>---
_resources/port1.0/group/meson-1.0.tcl | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/meson-1.0.tcl b/_resources/port1.0/group/meson-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 556d1bdf445..dbc71cbadb1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/meson-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/meson-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,19 +41,21 @@ namespace eval meson { }
</span>
proc meson::get_post_args {} {
global configure.dir build_dir build.dir muniversal.current_arch muniversal.build_arch
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set args [list ${configure.dir}]
</span> if {[info exists muniversal.build_arch]} {
# muniversal 1.1 PG is being used
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend args ${build.dir}
</span> if {[option muniversal.is_cross.[option muniversal.build_arch]]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "${configure.dir} ${build.dir} --cross-file=[option muniversal.build_arch]-darwin --wrap-mode=[option meson.wrap_mode]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return "${configure.dir} ${build.dir} --wrap-mode=[option meson.wrap_mode]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend args --cross-file=[option muniversal.build_arch]-darwin
</span> }
} elseif {[info exists muniversal.current_arch]} {
# muniversal 1.0 PG is being used
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "${configure.dir} ${build_dir}-${muniversal.current_arch} --cross-file=${muniversal.current_arch}-darwin --wrap-mode=[option meson.wrap_mode]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend args ${build_dir}-${muniversal.current_arch} --cross-file=${muniversal.current_arch}-darwin
</span> } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "${configure.dir} ${build_dir} --wrap-mode=[option meson.wrap_mode]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend args ${build_dir}
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend args --wrap-mode=[option meson.wrap_mode]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ${args}
</span> }
proc meson::add_depends {} {
</pre><pre style='margin:0'>
</pre>