<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/320d878c039fe0a8becb2095add3b3cf96e4d95d">https://github.com/macports/macports-ports/commit/320d878c039fe0a8becb2095add3b3cf96e4d95d</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 320d878c039fe0a8becb2095add3b3cf96e4d95d
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Tue Apr 17 14:41:55 2018 +1000
<span style='display:block; white-space:pre;color:#404040;'> Portgroups: remove eval, add {*}
</span>---
_resources/port1.0/group/compilers-1.0.tcl | 77 ++++++++++++---------------
_resources/port1.0/group/mpi-1.0.tcl | 84 +++++++++++++++---------------
_resources/port1.0/group/perl5-1.0.tcl | 7 +--
_resources/port1.0/group/qmake5-1.0.tcl | 4 +-
_resources/port1.0/group/ruby-1.0.tcl | 2 +-
5 files changed, 80 insertions(+), 94 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/compilers-1.0.tcl b/_resources/port1.0/group/compilers-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 6f18393..9722a51 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/compilers-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/compilers-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -214,16 +214,16 @@ foreach variant ${compilers.variants} {
</span> proc compilers.set_variants_conflict {args} {
global compilers.variants_conflict
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend compilers.variants_conflict $args
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend compilers.variants_conflict {*}$args
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-proc compilers.setup_variants {args} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc compilers.setup_variants {variants} {
</span> global cdb compilers.variants compilers.clang_variants compilers.gcc_variants
global compilers.fortran_variants compilers.list
global compilers.variants_conflict
global compilers.clear_archflags
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach variant [split $args] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach variant $variants {
</span> if {$cdb($variant,f77) ne ""} {
lappend compilers.fortran_variants $variant
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -256,40 +256,37 @@ proc compilers.setup_variants {args} {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set body "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append $cdb($variant,depends)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append $cdb($variant,dependsl)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-delete $cdb($variant,dependsd)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_skip_archcheck $cdb($variant,dependsa)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set compilers.libfortran $cdb($variant,libfortran)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "
</span> # TODO: all the compilers are in portconfigure now, so see if below
# is even needed now;
# for each compiler, set the value if not empty; we can't use
# configure.compiler because of dragonegg and possibly other new
# compilers that aren't in macports portconfigure.tcl
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set comp ""
</span> foreach compiler ${compilers.list} {
if {$cdb($variant,$compiler) ne ""} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- append comp [subst {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append body "
</span> configure.$compiler $cdb($variant,$compiler)
# disable archflags
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${compilers.clear_archflags} && "[info command configure.${compiler}_archflags]" ne ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {\${compilers.clear_archflags} && \[info commands configure.${compiler}_archflags\] ne {}} {
</span> configure.${compiler}_archflags
configure.ld_archflags
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- eval [subst {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant ${variant} description \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {Build using the $cdb($variant,descrip) compiler} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts $c ${compilers.variants_conflict} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append $cdb($variant,depends)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append $cdb($variant,dependsl)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-delete $cdb($variant,dependsd)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_skip_archcheck $cdb($variant,dependsa)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set compilers.libfortran $cdb($variant,libfortran)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $comp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant ${variant} description \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "Build using the $cdb($variant,descrip) compiler" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts {*}$c {*}${compilers.variants_conflict} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${body}
</span> }
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -484,14 +481,12 @@ proc compilers.is_c_only {} {
</span>
proc compilers.enforce_c {args} {
global compilers.required_c
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach portname $args {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend compilers.required_c $portname
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend compilers.required_c {*}$args
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-proc compilers.action_enforce_c {args} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "compilers.enforce_c list: ${args}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach portname $args {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc compilers.action_enforce_c {ports} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "compilers.enforce_c list: ${ports}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach portname $ports {
</span> if {![catch {set result [active_variants $portname "" ""]}]} {
set otcomp [c_active_variant_name $portname]
set mycomp [c_variant_name]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -511,21 +506,17 @@ proc compilers.action_enforce_c {args} {
</span>
proc compilers.enforce_fortran {args} {
global compilers.required_f
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach portname $args {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend compilers.required_f $portname
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend compilers.required_f {*}$args
</span> }
proc compilers.enforce_some_fortran {args} {
global compilers.required_some_f
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach portname $args {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend compilers.required_some_f $portname
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend compilers.required_some_f {*}$args
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-proc compilers.action_enforce_f {args} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "compilers.enforce_fortran list: ${args}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach portname $args {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc compilers.action_enforce_f {ports} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "compilers.enforce_fortran list: ${ports}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach portname $ports {
</span> if {![catch {set result [active_variants $portname "" ""]}]} {
set otf [fortran_active_variant_name $portname]
set myf [fortran_variant_name]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -545,9 +536,9 @@ proc compilers.action_enforce_f {args} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-proc compilers.action_enforce_some_f {args} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "compilers.enforce_some_fortran list: ${args}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach portname $args {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc compilers.action_enforce_some_f {ports} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "compilers.enforce_some_fortran list: ${ports}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach portname $ports {
</span> if {![catch {set result [active_variants $portname "" ""]}]} {
if {[fortran_active_variant_name $portname] eq ""} {
ui_error "Install $portname with a Fortran variant (e.g. +gfortran, +gccX, +g95)"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -649,7 +640,7 @@ proc compilers.setup {args} {
</span> }
set compilers.variants [lsort [concat [remove_from_list $remove_list $duplicates] $add_list]]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- eval compilers.setup_variants ${compilers.variants}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compilers.setup_variants ${compilers.variants}
</span>
# reverse the gcc list so that the higher numbered ones are default
set ordered_variants {gfortran}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -687,7 +678,7 @@ pre-fetch {
</span> if {${compilers.require_fortran} && [fortran_variant_name] eq ""} {
return -code error "must set at least one Fortran variant (e.g. +gfortran, +gccX, +g95)"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- eval compilers.action_enforce_c ${compilers.required_c}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- eval compilers.action_enforce_f ${compilers.required_f}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- eval compilers.action_enforce_some_f ${compilers.required_some_f}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compilers.action_enforce_c ${compilers.required_c}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compilers.action_enforce_f ${compilers.required_f}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compilers.action_enforce_some_f ${compilers.required_some_f}
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/mpi-1.0.tcl b/_resources/port1.0/group/mpi-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index d1c1ded..07c3349 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/mpi-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/mpi-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -93,15 +93,15 @@ foreach mpiname [array names mpidb *,variant] {
</span> lappend mpi.variants $mpidb($mpiname)
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-proc mpi.setup_variants {args} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc mpi.setup_variants {variants} {
</span> global mpidb mpi.cc mpi.cxx mpi.f77 mpi.f90 mpi.fc
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach variant $args {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach variant $variants {
</span> if {[variant_exists $variant]} {
ui_debug "$variant variant already exists, so not adding the default one"
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set i [lsearch -exact $args $variant]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set c [lreplace $args $i $i]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set i [lsearch -exact $variants $variant]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set c [lreplace $variants $i $i]
</span>
# only add conflicts for variants that exist
foreach j $mpidb($variant,conflict) {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -110,45 +110,43 @@ proc mpi.setup_variants {args} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- eval [subst {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant ${variant} description {Build using the $mpidb($variant,descrip) compiler} conflicts $c {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant ${variant} description "Build using the $mpidb($variant,descrip) compiler" conflicts {*}$c "
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set c_name \[c_variant_name\]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set f_name \[fortran_variant_name\]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set p_name \$c_name
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set d_name \$c_name
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {"\$c_name" eq ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set p_name "mp"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set d_name "default"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set c_name \[c_variant_name\]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set f_name \[fortran_variant_name\]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set p_name \$c_name
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set d_name \$c_name
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {\$c_name eq {}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set p_name mp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set d_name default
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set path "etc/select/mpi/$variant-\$p_name"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set path \"etc/select/mpi/${variant}-\${p_name}\"
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {\$f_name ne ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set path "\$path-fortran"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {\$f_name ne {}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set path \"\$path-fortran\"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append path:\$path:$mpidb($variant,name)-\$d_name
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set mpi.name $mpidb($variant,name)-\$d_name
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append path:\$path:$mpidb($variant,name)-\$d_name
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set mpi.name $mpidb($variant,name)-\$d_name
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach compiler {cc cxx f77 f90 exec} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set mpi.\$compiler mpi\${compiler}-$mpidb($variant,name)-\$p_name
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set mpi.fc mpif90-$mpidb($variant,name)-\$p_name
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # there is no mpicpp or mpiobj
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # if more compilers are added in compilers portgroup, need to be added here
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach compiler \${compilers.list} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {\$compiler ne "fc" && \$compiler ne "cpp" && \$compiler ne "objc"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.\$compiler \${prefix}/bin/mpi\${compiler}-$mpidb($variant,name)-\$p_name
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lsearch -exact \${compilers.list} fc]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set configure.fc \${prefix}/bin/mpif90-$mpidb($variant,name)-\$p_name
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach compiler {cc cxx f77 f90 exec} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set mpi.\$compiler mpi\${compiler}-$mpidb($variant,name)-\$p_name
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set mpi.fc mpif90-$mpidb($variant,name)-\$p_name
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # there is no mpicpp or mpiobj
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # if more compilers are added in compilers portgroup, need to be added here
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach compiler \${compilers.list} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {\$compiler ne \"fc\" && \$compiler ne \"cpp\" && \$compiler ne \"objc\"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.\$compiler \${prefix}/bin/mpi\${compiler}-$mpidb($variant,name)-\$p_name
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {\"fc\" in \${compilers.list}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set configure.fc \${prefix}/bin/mpif90-$mpidb($variant,name)-\$p_name
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "
</span> }
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -187,10 +185,10 @@ proc mpi.enforce_variant {args} {
</span> set mpi.required_variants $args
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-proc mpi.action_enforce_variants {args} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc mpi.action_enforce_variants {ports} {
</span> global name
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "mpi.enforce_variant list: ${args}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach portname $args {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "mpi.enforce_variant list: ${ports}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach portname $ports {
</span> if {![catch {set result [active_variants $portname "" ""]}]} {
set otmpi [mpi_active_variant_name $portname]
set mympi [mpi_variant_name]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -206,7 +204,7 @@ proc mpi.action_enforce_variants {args} {
</span> return -code error "$portname +$mympi not installed"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- eval compilers.action_enforce_c $portname
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compilers.action_enforce_c $portname
</span> } else {
ui_error "Internal error: '$portname' is not an installed port."
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -307,7 +305,7 @@ proc mpi.setup {args} {
</span> # here we add all compiler variants since we can't dynamically look up
# which variants are enabled for the mpi ports; instead we'll use active
# variants to detect an incompatibility
<span style='display:block; white-space:pre;background:#ffe0e0;'>- eval compilers.setup $cl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compilers.setup {*}$cl
</span>
# we need to check for a removed variant early so we can exit before
# the wrong variant is passed up the dependency chain
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -320,7 +318,7 @@ proc mpi.setup {args} {
</span> return -code error "$name +$badvariant not allowed"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- eval mpi.setup_variants ${mpi.variants}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mpi.setup_variants ${mpi.variants}
</span>
set mpi [ mpi_variant_name ]
if {$mpi ne ""} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -347,5 +345,5 @@ pre-fetch {
</span> if {${mpi.require} && [mpi_variant_name] eq ""} {
return -code error "must set at least one mpi variant"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- eval mpi.action_enforce_variants ${mpi.required_variants}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mpi.action_enforce_variants ${mpi.required_variants}
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/perl5-1.0.tcl b/_resources/port1.0/group/perl5-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 690f7b4..2a9508c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/perl5-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/perl5-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -105,14 +105,11 @@ proc perl5.create_variants {branches} {
</span> set index [lsearch ${branches} ${branch}]
set variant [lindex ${perl5.variants} ${index}]
# Add conflicts
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set conflicts {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set filtered {}
</span> if {${perl5.conflict_variants}} {
set filtered [lreplace ${perl5.variants} ${index} ${index}]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$filtered ne ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set conflicts "conflicts {$filtered}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- eval "variant ${variant} ${conflicts} description Use MacPorts perl${branch} {}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant ${variant} conflicts {*}${filtered} description "Use MacPorts perl${branch}" {}
</span> if {[variant_isset ${variant}]} {
perl5.variant ${variant}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/qmake5-1.0.tcl b/_resources/port1.0/group/qmake5-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index ebb30f4..45ee671 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/qmake5-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/qmake5-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,8 +64,8 @@ pre-configure {
</span> } else {
if {[variant_exists universal] && [variant_isset universal]} {
global merger_configure_args
<span style='display:block; white-space:pre;background:#ffe0e0;'>- eval lappend merger_configure_args(i386) ${qt5.spec_cmd}${qt_qmake_spec_32}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- eval lappend merger_configure_args(x86_64) ${qt5.spec_cmd}${qt_qmake_spec_64}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_configure_args(i386) {*}${qt5.spec_cmd}${qt_qmake_spec_32}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_configure_args(x86_64) {*}${qt5.spec_cmd}${qt_qmake_spec_64}
</span> } else {
configure.args-append "${qt5.spec_cmd}${qt_qmake_spec}"
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/ruby-1.0.tcl b/_resources/port1.0/group/ruby-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index eabeb93..3866d61 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/ruby-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/ruby-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -548,6 +548,6 @@ proc trimroot {root path} {
</span> if {[llength $acc] == 0} {
return ""
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return [eval [subst -nobackslashes -nocommands {file join $acc}]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return [file join {*}$acc]
</span> }
}
</pre><pre style='margin:0'>
</pre>