[121974] trunk/dports/_resources/port1.0/group/compilers-1.0.tcl
sean at macports.org
sean at macports.org
Fri Jul 11 23:11:12 PDT 2014
Revision: 121974
https://trac.macports.org/changeset/121974
Author: sean at macports.org
Date: 2014-07-11 23:11:12 -0700 (Fri, 11 Jul 2014)
Log Message:
-----------
compilers-1.0: only add conflicts for variants that exist; fixes #44144
Modified Paths:
--------------
trunk/dports/_resources/port1.0/group/compilers-1.0.tcl
Modified: trunk/dports/_resources/port1.0/group/compilers-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/compilers-1.0.tcl 2014-07-12 05:27:37 UTC (rev 121973)
+++ trunk/dports/_resources/port1.0/group/compilers-1.0.tcl 2014-07-12 06:11:12 UTC (rev 121974)
@@ -201,6 +201,14 @@
set c [lreplace $c $i $i]
}
+ # only add conflicts from the compiler database (set above) if we
+ # actually have the compiler in the list of allowed variants
+ foreach j $cdb($variant,conflict) {
+ if {[lsearch -exact $j ${compilers.variants}] > -1} {
+ lappend c $j
+ }
+ }
+
# 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
@@ -222,7 +230,7 @@
eval [subst {
variant ${variant} description \
{Build using the $cdb($variant,descrip) compiler} \
- conflicts $c $cdb($variant,conflict) {
+ conflicts $c {
depends_build-append $cdb($variant,depends)
depends_lib-append $cdb($variant,dependsl)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140711/1612aef1/attachment.html>
More information about the macports-changes
mailing list