<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/75aeaf2dbcb436c71fd41c25d483d4125eaf424d">https://github.com/macports/macports-ports/commit/75aeaf2dbcb436c71fd41c25d483d4125eaf424d</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 75aeaf2dbcb436c71fd41c25d483d4125eaf424d
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sat Jun 11 08:39:54 2022 -0700
<span style='display:block; white-space:pre;color:#404040;'> meson PG: add support for muniversal PG 1.1
</span>---
_resources/port1.0/group/meson-1.0.tcl | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 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 761e2e03b7e..9a422b114fa 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;'>@@ -33,8 +33,16 @@ default destroot.post_args ""
</span> namespace eval meson { }
proc meson::get_post_args {} {
<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:#e0ffe0;'>+ global configure.dir build_dir build.dir muniversal.current_arch muniversal.build_arch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[info exists muniversal.build_arch]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # muniversal 1.1 PG is being used
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[option muniversal.is_cross.[option muniversal.build_arch]]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "${configure.dir} ${build.dir} --cross-file=[option muniversal.build_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;'>+ } elseif {[info exists muniversal.current_arch]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # muniversal 1.0 PG is being used
</span> return "${configure.dir} ${build_dir}-${muniversal.current_arch} --cross-file=${muniversal.current_arch}-darwin"
} else {
return "${configure.dir} ${build_dir}"
</pre><pre style='margin:0'>
</pre>