<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/6acd97e17362ef24758f9ced4f1f8e0b7ed41603">https://github.com/macports/macports-ports/commit/6acd97e17362ef24758f9ced4f1f8e0b7ed41603</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 6acd97e1736 meson PG: Set port depends in callback
</span>6acd97e1736 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6acd97e17362ef24758f9ced4f1f8e0b7ed41603
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Wed May 5 13:52:53 2021 +0100
<span style='display:block; white-space:pre;color:#404040;'> meson PG: Set port depends in callback
</span>---
_resources/port1.0/group/meson-1.0.tcl | 24 ++++++++++++++----------
1 file changed, 14 insertions(+), 10 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 4aa9f3d4d9a..761e2e03b7e 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;'>@@ -11,8 +11,6 @@
</span> # meson builds need to be done out-of-source
default build_dir {${workpath}/build}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build-append port:meson \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:ninja
</span> depends_skip_archcheck-append \
meson \
ninja
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,13 +30,19 @@ default build.target ""
</span> destroot.env-append DESTDIR=${destroot}
default destroot.post_args ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-namespace eval meson {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- proc get_post_args {} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- global configure.dir build_dir muniversal.current_arch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[info exists muniversal.current_arch]} {
</span><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:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return "${configure.dir} ${build_dir}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+namespace eval meson { }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc meson::get_post_args {} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global configure.dir build_dir muniversal.current_arch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[info exists muniversal.current_arch]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "${configure.dir} ${build_dir}-${muniversal.current_arch} --cross-file=${muniversal.current_arch}-darwin"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "${configure.dir} ${build_dir}"
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc meson::add_depends {} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:meson \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ninja
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+port::register_callback meson::add_depends
</span></pre><pre style='margin:0'>
</pre>