<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[134832] trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/134832">134832</a></dd>
<dt>Author</dt> <dd>jmr@macports.org</dd>
<dt>Date</dt> <dd>2015-04-08 06:33:26 -0700 (Wed, 08 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>muniversal portgroup: use {*} instead of eval where needed, and remove a number of unnecessary evals</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdports_resourcesport10groupmuniversal10tcl">trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdports_resourcesport10groupmuniversal10tcl"></a>
<div class="modfile"><h4>Modified: trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl (134831 => 134832)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl 2015-04-08 13:31:50 UTC (rev 134831)
+++ trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl 2015-04-08 13:33:26 UTC (rev 134832)
</span><span class="lines">@@ -124,12 +124,12 @@
</span><span class="cx"> configure.universal_ldflags-delete -arch ${arch}
</span><span class="cx"> }
</span><span class="cx">
</span><del>- eval configure.args-append ${configure.universal_args}
- eval configure.cflags-append ${configure.universal_cflags}
- eval configure.cxxflags-append ${configure.universal_cxxflags}
- eval configure.objcflags-append ${configure.universal_cflags}
- eval configure.ldflags-append ${configure.universal_ldflags}
- eval configure.cppflags-append ${configure.universal_cppflags}
</del><ins>+ configure.args-append {*}${configure.universal_args}
+ configure.cflags-append {*}${configure.universal_cflags}
+ configure.cxxflags-append {*}${configure.universal_cxxflags}
+ configure.objcflags-append {*}${configure.universal_cflags}
+ configure.ldflags-append {*}${configure.universal_ldflags}
+ configure.cppflags-append {*}${configure.universal_cppflags}
</ins><span class="cx">
</span><span class="cx"> # user has specified that build platform must be able to run binaries for supported architectures
</span><span class="cx"> if { ${merger_must_run_binaries}=="yes" } {
</span><span class="lines">@@ -290,7 +290,7 @@
</span><span class="cx"> set configure_dir_save ${configure.dir}
</span><span class="cx"> if { [string match "${worksrcpath}/*" ${configure.dir}] } {
</span><span class="cx"> # The configure directory is inside the source directory, so put in the new source directory name.
</span><del>- eval configure.dir [string map "${worksrcpath} ${worksrcpath}-${arch}" ${configure.dir}]
</del><ins>+ configure.dir [string map "${worksrcpath} ${worksrcpath}-${arch}" ${configure.dir}]
</ins><span class="cx"> } else {
</span><span class="cx"> # The configure directory is outside the source directory, so give it a new name by appending ${arch}.
</span><span class="cx"> configure.dir ${configure.dir}-${arch}
</span><span class="lines">@@ -302,7 +302,7 @@
</span><span class="cx"> set autoreconf_dir_save ${autoreconf.dir}
</span><span class="cx"> if { [string match "${worksrcpath}/*" ${autoreconf.dir}] } {
</span><span class="cx"> # The autoreconf directory is inside the source directory, so put in the new source directory name.
</span><del>- eval autoreconf.dir [string map "${worksrcpath} ${worksrcpath}-${arch}" ${autoreconf.dir}]
</del><ins>+ autoreconf.dir [string map "${worksrcpath} ${worksrcpath}-${arch}" ${autoreconf.dir}]
</ins><span class="cx"> } else {
</span><span class="cx"> # The autoreconf directory is outside the source directory, so give it a new name by appending ${arch}.
</span><span class="cx"> autoreconf.dir ${autoreconf.dir}-${arch}
</span><span class="lines">@@ -314,15 +314,15 @@
</span><span class="cx"> portconfigure::configure_main
</span><span class="cx">
</span><span class="cx"> # Undo changes to the configure related variables
</span><del>- eval autoreconf.dir ${autoreconf_dir_save}
- eval configure.dir ${configure_dir_save}
- eval configure.compiler ${configure_compiler_save}
- eval configure.f90 ${configure_f90_save}
- eval configure.f77 ${configure_f77_save}
- eval configure.fc ${configure_fc_save}
- eval configure.cc ${configure_cc_save}
- eval configure.cxx ${configure_cxx_save}
- eval configure.objc ${configure_objc_save}
</del><ins>+ autoreconf.dir ${autoreconf_dir_save}
+ configure.dir ${configure_dir_save}
+ configure.compiler ${configure_compiler_save}
+ configure.f90 ${configure_f90_save}
+ configure.f77 ${configure_f77_save}
+ configure.fc ${configure_fc_save}
+ configure.cc ${configure_cc_save}
+ configure.cxx ${configure_cxx_save}
+ configure.objc ${configure_objc_save}
</ins><span class="cx"> if { [info exists merger_configure_args(${arch})] } {
</span><span class="cx"> configure.args-delete $merger_configure_args(${arch})
</span><span class="cx"> }
</span><span class="lines">@@ -370,7 +370,7 @@
</span><span class="cx"> set build_dir_save ${build.dir}
</span><span class="cx"> if { [string match "${worksrcpath}/*" ${build.dir}] } {
</span><span class="cx"> # The build directory is inside the source directory, so put in the new source directory name.
</span><del>- eval build.dir [string map "${worksrcpath} ${worksrcpath}-${arch}" ${build.dir}]
</del><ins>+ build.dir [string map "${worksrcpath} ${worksrcpath}-${arch}" ${build.dir}]
</ins><span class="cx"> } else {
</span><span class="cx"> # The build directory is outside the source directory, so give it a new name by appending ${arch}.
</span><span class="cx"> build.dir ${build.dir}-${arch}
</span><span class="lines">@@ -381,7 +381,7 @@
</span><span class="cx">
</span><span class="cx"> portbuild::build_main
</span><span class="cx">
</span><del>- eval build.dir ${build_dir_save}
</del><ins>+ build.dir ${build_dir_save}
</ins><span class="cx"> if { [info exists merger_build_args(${arch})] } {
</span><span class="cx"> build.args-delete $merger_build_args(${arch})
</span><span class="cx"> }
</span><span class="lines">@@ -396,7 +396,7 @@
</span><span class="cx"> ui_info "$UI_PREFIX [format [msgcat::mc "Staging %1\$s into destroot for architecture %2\$s"] ${subport} ${arch}]"
</span><span class="cx"> copy ${destroot} ${workpath}/destroot-${arch}
</span><span class="cx"> set destdirSave ${destroot.destdir}
</span><del>- eval destroot.destdir [string map "${destroot} ${workpath}/destroot-${arch}" ${destroot.destdir}]
</del><ins>+ destroot.destdir [string map "${destroot} ${workpath}/destroot-${arch}" ${destroot.destdir}]
</ins><span class="cx">
</span><span class="cx"> if { [info exists merger_destroot_env(${arch})] } {
</span><span class="cx"> destroot.env-append $merger_destroot_env(${arch})
</span><span class="lines">@@ -407,7 +407,7 @@
</span><span class="cx"> set destroot_dir_save ${destroot.dir}
</span><span class="cx"> if { [string match "${worksrcpath}/*" ${destroot.dir}] } {
</span><span class="cx"> # The destroot directory is inside the source directory, so put in the new source directory name.
</span><del>- eval destroot.dir [string map "${worksrcpath} ${worksrcpath}-${arch}" ${destroot.dir}]
</del><ins>+ destroot.dir [string map "${worksrcpath} ${worksrcpath}-${arch}" ${destroot.dir}]
</ins><span class="cx"> } else {
</span><span class="cx"> # The destroot directory is outside the source directory, so give it a new name by appending ${arch}.
</span><span class="cx"> destroot.dir ${destroot.dir}-${arch}
</span><span class="lines">@@ -425,7 +425,7 @@
</span><span class="cx"> if { [info exists merger_destroot_env(${arch})] } {
</span><span class="cx"> destroot.env-delete $merger_destroot_env(${arch})
</span><span class="cx"> }
</span><del>- eval destroot.destdir ${destdirSave}
</del><ins>+ destroot.destdir ${destdirSave}
</ins><span class="cx"> }
</span><span class="cx"> delete ${destroot}
</span><span class="cx">
</span><span class="lines">@@ -719,7 +719,7 @@
</span><span class="cx"> set test_dir_save ${test.dir}
</span><span class="cx"> if { [string match "${worksrcpath}/*" ${test.dir}] } {
</span><span class="cx"> # The test directory is inside the source directory, so put in the new source directory name.
</span><del>- eval test.dir [string map "${worksrcpath} ${worksrcpath}-${arch}" ${test.dir}]
</del><ins>+ test.dir [string map "${worksrcpath} ${worksrcpath}-${arch}" ${test.dir}]
</ins><span class="cx"> } else {
</span><span class="cx"> # The test directory is outside the source directory, so give it a new name by appending ${arch}.
</span><span class="cx"> test.dir ${test.dir}-${arch}
</span></span></pre>
</div>
</div>
</body>
</html>