<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/7c7c4d863cc324cd417b6baec1dd4d52034347fc">https://github.com/macports/macports-ports/commit/7c7c4d863cc324cd417b6baec1dd4d52034347fc</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 7c7c4d863cc324cd417b6baec1dd4d52034347fc
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Thu Mar 19 08:09:43 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> muniversal PG: use loops to facilitate new languages
</span>---
_resources/port1.0/group/muniversal-1.0.tcl | 50 ++++++++---------------------
1 file changed, 14 insertions(+), 36 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/muniversal-1.0.tcl b/_resources/port1.0/group/muniversal-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 56d8e0b..10f08ff 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/muniversal-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/muniversal-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -96,17 +96,15 @@ variant universal {
</span> global universal_archs_to_use
foreach arch ${universal_archs} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.universal_cflags-delete -arch ${arch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.universal_cxxflags-delete -arch ${arch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.universal_ldflags-delete -arch ${arch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach lang {c cxx ld} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.universal_${lang}flags-delete -arch ${arch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
configure.args-append {*}${configure.universal_args}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cflags-append {*}${configure.universal_cflags}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cxxflags-append {*}${configure.universal_cxxflags}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.objcflags-append {*}${configure.universal_cflags}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ldflags-append {*}${configure.universal_ldflags}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cppflags-append {*}${configure.universal_cppflags}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach lang {c cxx objc cpp ld} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.${lang}flags-append {*}[option configure.universal_${lang}flags]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
# user has specified that build platform must be able to run binaries for supported architectures
if { ${merger_must_run_binaries}=="yes" } {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -227,20 +225,10 @@ variant universal {
</span> if { [info exists merger_configure_env(${arch})] } {
configure.env-append {*}$merger_configure_env(${arch})
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [info exists merger_configure_cppflags(${arch})] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cppflags-prepend {*}$merger_configure_cppflags(${arch})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [info exists merger_configure_cflags(${arch})] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cflags-append {*}$merger_configure_cflags(${arch})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [info exists merger_configure_cxxflags(${arch})] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cxxflags-append {*}$merger_configure_cxxflags(${arch})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [info exists merger_configure_objcflags(${arch})] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.objcflags-append {*}$merger_configure_objcflags(${arch})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [info exists merger_configure_ldflags(${arch})] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ldflags-append {*}$merger_configure_ldflags(${arch})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach lang {cpp c cxx objc ld} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [info exists merger_configure_${lang}flags(${arch})] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.${lang}flags-prepend {*}[set merger_configure_${lang}flags(${arch})]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
# Don't set the --host unless we have to.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -364,20 +352,10 @@ variant universal {
</span> configure.args-delete {*}$merger_configure_args(${arch})
}
configure.args-delete ${host}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [info exists merger_configure_ldflags(${arch})] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ldflags-delete {*}$merger_configure_ldflags(${arch})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [info exists merger_configure_cxxflags(${arch})] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cxxflags-delete {*}$merger_configure_cxxflags(${arch})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [info exists merger_configure_objcflags(${arch})] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.objcflags-delete {*}$merger_configure_objcflags(${arch})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [info exists merger_configure_cflags(${arch})] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cflags-delete {*}$merger_configure_cflags(${arch})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [info exists merger_configure_cppflags(${arch})] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cppflags-delete {*}$merger_configure_cppflags(${arch})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach lang {ld cxx objc c cpp} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [info exists merger_configure_${lang}flags(${arch})] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.${lang}flags-delete {*}[set merger_configure_${lang}flags(${arch})]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
if { [info exists merger_configure_env(${arch})] } {
configure.env-delete {*}$merger_configure_env(${arch})
</pre><pre style='margin:0'>
</pre>