<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/aee1e8c8e92e745c54578aaff0851f6c48bc1f01">https://github.com/macports/macports-ports/commit/aee1e8c8e92e745c54578aaff0851f6c48bc1f01</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit aee1e8c8e92e745c54578aaff0851f6c48bc1f01
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sat Jun 11 08:47:50 2022 -0700
<span style='display:block; white-space:pre;color:#404040;'> gobject_introspection PG: support muniversal PG 1.1
</span>---
_resources/port1.0/group/gobject_introspection-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/gobject_introspection-1.0.tcl b/_resources/port1.0/group/gobject_introspection-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index c5f7bb8e664..05604d094bc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/gobject_introspection-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/gobject_introspection-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -95,7 +95,7 @@ proc gobject_introspection_pg::gobject_introspection_setup {} {
</span> gobject_introspection.build.cflags-append "-isysroot${sdk_root}"
gobject_introspection.build.ldflags-append "-Wl,-syslibroot,${sdk_root}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![exists universal_archs_supported] || ![variant_exists universal] || ![variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {(![exists muniversal.architectures] && ![exists universal_archs_supported]) || ![variant_exists universal] || ![variant_isset universal]} {
</span> # muniversal PG is *not* being used
foreach tool {cc ld} {
if {[catch {get_canonical_archflags $tool} flags]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -104,8 +104,16 @@ proc gobject_introspection_pg::gobject_introspection_setup {} {
</span> set env_var [gobject_introspection_pg::map_tool_to_environment_variable $tool]
gobject_introspection.build.[string tolower ${env_var}]-append {*}${flags}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {[exists muniversal.architectures]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # muniversal PG 1.1 is being used
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach arch [option muniversal.architectures] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach tool {cc ld} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set env_var [gobject_introspection_pg::map_tool_to_environment_variable $tool]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args.${arch}-append ${env_var}+="[muniversal::get_archflag ${tool} ${arch}]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # muniversal PG is being used
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # muniversal PG 1.0 is being used
</span> global merger_build_args
foreach arch [option configure.universal_archs] {
foreach tool {cc ld} {
</pre><pre style='margin:0'>
</pre>