<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d8cb2dcd9a0d9bae5a0bd46f6b1bc6da7b365cf4">https://github.com/macports/macports-ports/commit/d8cb2dcd9a0d9bae5a0bd46f6b1bc6da7b365cf4</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 d8cb2dc muniversal-1.0.tcl: treat merger_* list variables as lists
</span>d8cb2dc is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d8cb2dcd9a0d9bae5a0bd46f6b1bc6da7b365cf4
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri Mar 9 16:21:33 2018 -0600
<span style='display:block; white-space:pre;color:#404040;'> muniversal-1.0.tcl: treat merger_* list variables as lists
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/56002
</span>---
_resources/port1.0/group/muniversal-1.0.tcl | 56 ++++++++++++++---------------
1 file changed, 28 insertions(+), 28 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 3b605f1..89c00ae 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;'>@@ -1,6 +1,6 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Copyright (c) 2009-2017 The MacPorts Project,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Copyright (c) 2009-2018 The MacPorts Project,
</span> # All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -219,22 +219,22 @@ variant universal {
</span> }
if { [info exists merger_configure_env(${arch})] } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append $merger_configure_env(${arch})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append {*}$merger_configure_env(${arch})
</span> }
if { [info exists merger_configure_cppflags(${arch})] } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cppflags-append $merger_configure_cppflags(${arch})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cppflags-append {*}$merger_configure_cppflags(${arch})
</span> }
if { [info exists merger_configure_cflags(${arch})] } {
<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:#e0ffe0;'>+ configure.cflags-append {*}$merger_configure_cflags(${arch})
</span> }
if { [info exists merger_configure_cxxflags(${arch})] } {
<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:#e0ffe0;'>+ configure.cxxflags-append {*}$merger_configure_cxxflags(${arch})
</span> }
if { [info exists merger_configure_objcflags(${arch})] } {
<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:#e0ffe0;'>+ configure.objcflags-append {*}$merger_configure_objcflags(${arch})
</span> }
if { [info exists merger_configure_ldflags(${arch})] } {
<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;'>+ configure.ldflags-append {*}$merger_configure_ldflags(${arch})
</span> }
# Don't set the --host unless we have to.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -262,11 +262,11 @@ variant universal {
</span> }
}
if {$host != ""} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append ${host}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append ${host}
</span> }
if { [info exists merger_configure_args(${arch})] } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append $merger_configure_args(${arch})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append {*}$merger_configure_args(${arch})
</span> }
set configure_compiler_save ${configure.compiler}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -346,26 +346,26 @@ variant universal {
</span> option configure.cxx ${configure_cxx_save}
option configure.objc ${configure_objc_save}
if { [info exists merger_configure_args(${arch})] } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete $merger_configure_args(${arch})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete {*}$merger_configure_args(${arch})
</span> }
configure.args-delete ${host}
if { [info exists merger_configure_ldflags(${arch})] } {
<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:#e0ffe0;'>+ configure.ldflags-delete {*}$merger_configure_ldflags(${arch})
</span> }
if { [info exists merger_configure_cxxflags(${arch})] } {
<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:#e0ffe0;'>+ configure.cxxflags-delete {*}$merger_configure_cxxflags(${arch})
</span> }
if { [info exists merger_configure_objcflags(${arch})] } {
<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:#e0ffe0;'>+ configure.objcflags-delete {*}$merger_configure_objcflags(${arch})
</span> }
if { [info exists merger_configure_cflags(${arch})] } {
<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:#e0ffe0;'>+ configure.cflags-delete {*}$merger_configure_cflags(${arch})
</span> }
if { [info exists merger_configure_cppflags(${arch})] } {
<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;'>+ configure.cppflags-delete {*}$merger_configure_cppflags(${arch})
</span> }
if { [info exists merger_configure_env(${arch})] } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-delete $merger_configure_env(${arch})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-delete {*}$merger_configure_env(${arch})
</span> }
if { ${merger_arch_flag} != "no" } {
configure.ldflags-delete ${archf}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -384,10 +384,10 @@ variant universal {
</span> ui_info "$UI_PREFIX [format [msgcat::mc "Building %1\$s for architecture %2\$s"] ${subport} ${arch}]"
if { [info exists merger_build_env(${arch})] } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append $merger_build_env(${arch})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append {*}$merger_build_env(${arch})
</span> }
if { [info exists merger_build_args(${arch})] } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args-append $merger_build_args(${arch})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-append {*}$merger_build_args(${arch})
</span> }
set build_dir_save ${build.dir}
if { [string match "${worksrcpath}/*" ${build.dir}] } {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -411,10 +411,10 @@ variant universal {
</span>
option build.dir ${build_dir_save}
if { [info exists merger_build_args(${arch})] } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args-delete $merger_build_args(${arch})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-delete {*}$merger_build_args(${arch})
</span> }
if { [info exists merger_build_env(${arch})] } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-delete $merger_build_env(${arch})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-delete {*}$merger_build_env(${arch})
</span> }
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -427,10 +427,10 @@ variant universal {
</span> option destroot.destdir [string map "${destroot} ${workpath}/destroot-${arch}" ${destroot.destdir}]
if { [info exists merger_destroot_env(${arch})] } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.env-append $merger_destroot_env(${arch})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.env-append {*}$merger_destroot_env(${arch})
</span> }
if { [info exists merger_destroot_args(${arch})] } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.args-append $merger_destroot_args(${arch})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.args-append {*}$merger_destroot_args(${arch})
</span> }
set destroot_dir_save ${destroot.dir}
if { [string match "${worksrcpath}/*" ${destroot.dir}] } {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -454,10 +454,10 @@ variant universal {
</span>
option destroot.dir ${destroot_dir_save}
if { [info exists merger_destroot_args(${arch})] } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.args-delete $merger_destroot_args(${arch})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.args-delete {*}$merger_destroot_args(${arch})
</span> }
if { [info exists merger_destroot_env(${arch})] } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.env-delete $merger_destroot_env(${arch})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.env-delete {*}$merger_destroot_env(${arch})
</span> }
option destroot.destdir ${destdirSave}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -761,10 +761,10 @@ variant universal {
</span> ui_info "$UI_PREFIX [format [msgcat::mc "Testing %1\$s for architecture %2\$s"] ${subport} ${arch}]"
if { [info exists merger_test_env(${arch})] } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- test.env-append $merger_test_env(${arch})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.env-append {*}$merger_test_env(${arch})
</span> }
if { [info exists merger_test_args(${arch})] } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- test.args-append $merger_test_args(${arch})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.args-append {*}$merger_test_args(${arch})
</span> }
set test_dir_save ${test.dir}
if { [string match "${worksrcpath}/*" ${test.dir}] } {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -788,10 +788,10 @@ variant universal {
</span>
option test.dir ${test_dir_save}
if { [info exists merger_test_args(${arch})] } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- test.args-delete $merger_test_args(${arch})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.args-delete {*}$merger_test_args(${arch})
</span> }
if { [info exists merger_test_env(${arch})] } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- test.env-delete $merger_test_env(${arch})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.env-delete {*}$merger_test_env(${arch})
</span> }
}
}
</pre><pre style='margin:0'>
</pre>