<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/0ea0fca7c2259c0b417ccd7a8a80f6dcbaa681db">https://github.com/macports/macports-ports/commit/0ea0fca7c2259c0b417ccd7a8a80f6dcbaa681db</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 0ea0fca7c2259c0b417ccd7a8a80f6dcbaa681db
</span>Author: Dean M Greer <38226388+Gcenx@users.noreply.github.com>
AuthorDate: Fri Nov 25 13:11:25 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> pg meson-1.0: new option meson.wrap_mode, for subproject handling
</span>---
_resources/port1.0/group/meson-1.0.tcl | 13 +++++++++----
1 file changed, 9 insertions(+), 4 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 5dec5d87546..291c8d8f7c7 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;'>@@ -8,6 +8,11 @@
</span> #
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Wrap mode handling for subprojects.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Possible values: default, nofallback, nodownload, forcefallback, nopromote
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+options meson.wrap_mode
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default meson.wrap_mode {default}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # meson builds need to be done out-of-source
default build_dir {${workpath}/build}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,15 +43,15 @@ proc meson::get_post_args {} {
</span> if {[info exists muniversal.build_arch]} {
# muniversal 1.1 PG is being used
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"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "${configure.dir} ${build.dir} --cross-file=[option muniversal.build_arch]-darwin --wrap-mode=[option meson.wrap_mode]"
</span> } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "${configure.dir} ${build.dir}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "${configure.dir} ${build.dir} --wrap-mode=[option meson.wrap_mode]"
</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"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "${configure.dir} ${build_dir}-${muniversal.current_arch} --cross-file=${muniversal.current_arch}-darwin --wrap-mode=[option meson.wrap_mode]"
</span> } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return "${configure.dir} ${build_dir}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "${configure.dir} ${build_dir} --wrap-mode=[option meson.wrap_mode]"
</span> }
}
</pre><pre style='margin:0'>
</pre>