Revision: 119618 https://trac.macports.org/changeset/119618 Author: snc@macports.org Date: 2014-05-02 08:13:06 -0700 (Fri, 02 May 2014) Log Message: ----------- base: replace eval with expand Modified Paths: -------------- trunk/base/src/port1.0/portconfigure.tcl trunk/base/src/port1.0/portutil.tcl Modified: trunk/base/src/port1.0/portconfigure.tcl =================================================================== --- trunk/base/src/port1.0/portconfigure.tcl 2014-05-02 14:38:51 UTC (rev 119617) +++ trunk/base/src/port1.0/portconfigure.tcl 2014-05-02 15:13:06 UTC (rev 119618) @@ -79,7 +79,7 @@ ([info exists option_defaults(${type}.cmd)] && [set ${type}.cmd] eq $option_defaults(${type}.cmd)) || (![info exists option_defaults(${type}.cmd)] && [set ${type}.cmd] eq ${type}) )} { - eval [linsert $dep 0 depends_build-append] + depends_build-append {*}$dep } } @@ -99,14 +99,14 @@ autoreconf.cmd - automake.cmd - autoconf.cmd { - eval [linsert $configure_map(autoconf) 0 depends_build-delete] + depends_build-delete $configure_map(autoconf) } xmkmf.cmd { - eval [linsert $configure_map(xmkmf) 0 depends_build-delete] + depends_build-delete $configure_map(xmkmf) } use_xmkmf { if {[tbool args]} { - eval [linsert $configure_map(xmkmf) 0 depends_build-append] + depends_build-appendl $configure_map(xmkmf) } } default { @@ -232,7 +232,7 @@ } foreach {re fmt} $valid_compilers { if {[set matches [regexp -inline $re $compiler]] ne ""} { - set compiler_name [eval [linsert [lrange $matches 1 end] 0 format $fmt]] + set compiler_name [format $fmt {*}[lrange $matches 1 end]] break } } @@ -387,7 +387,7 @@ } foreach {re fmt} $valid_compiler_ports { if {[set matches [regexp -inline $re $compiler]] ne ""} { - return [eval [linsert [lrange $matches 1 end] 0 format $fmt]] + return [format $fmt {*}[lrange $matches 1 end] } } return {} @@ -702,7 +702,7 @@ PERL PYTHON RUBY INSTALL AWK BISON PKG_CONFIG PKG_CONFIG_PATH \ } { set value [option configure.[string tolower $env_var]] - eval [linsert $value 0 append_to_environment_value configure $env_var] + append_to_environment_value configure $env_var $value } # https://trac.macports.org/ticket/34221 @@ -719,16 +719,16 @@ } # add extra flags that are conditional on whether we're building universal - eval [linsert [get_canonical_archflags cc] 0 append_to_environment_value configure CFLAGS] + append_to_environment_value configure CFLAGS {*}[get_canonical_archflags cc] foreach tool {cxx objc objcxx cpp f77 f90 fc ld} { if {[catch {get_canonical_archflags $tool} flags]} { continue } set env_var [string toupper $tool]FLAGS - eval [linsert $flags 0 append_to_environment_value configure $env_var] + append_to_environment_value configure $env_var {*}$flags } if {[variant_exists universal] && [variant_isset universal]} { - eval [linsert ${configure.universal_args} 0 configure.pre_args-append] + configure.pre_args-append ${configure.universal_args} } else { foreach env_var {CFLAGS CXXFLAGS OBJCFLAGS OBJCXXFLAGS FFLAGS F90FLAGS FCFLAGS LDFLAGS} { if {${configure.march} ne ""} { Modified: trunk/base/src/port1.0/portutil.tcl =================================================================== --- trunk/base/src/port1.0/portutil.tcl 2014-05-02 14:38:51 UTC (rev 119617) +++ trunk/base/src/port1.0/portutil.tcl 2014-05-02 15:13:06 UTC (rev 119618) @@ -2823,7 +2823,7 @@ foreach arch ${archs} { lappend exec-lipo -arch ${arch} ${base}/${arch}${file} } - eval exec ${exec-lipo} [list -create -output ${target}${file}] + exec ${exec-lipo} {*}[list -create -output ${target}${file}] } # private function