[120828] trunk/dports/devel/swig/Portfile

[michaelld at macports.org]

Revision: 120828
          https://trac.macports.org/changeset/120828
Author:   michaelld at macports.org
Date:     2014-06-08 12:00:44 -0700 (Sun, 08 Jun 2014)
Log Message:
-----------
swig-gcj: fix +gcc4X variant checks to actually work.

Modified Paths:
--------------
    trunk/dports/devel/swig/Portfile

Modified: trunk/dports/devel/swig/Portfile
===================================================================
--- trunk/dports/devel/swig/Portfile	2014-06-08 18:51:39 UTC (rev 120827)
+++ trunk/dports/devel/swig/Portfile	2014-06-08 19:00:44 UTC (rev 120828)
@@ -122,12 +122,12 @@
     # Placeholder variant for the default.
     variant gcc47 conflicts gcc43 gcc44 gcc45 gcc48 description {build using GCJ 4.7} {}
 
-    if {![variant_isset gcc43] && ![variant_isset gcc44] &&
-        ![variant_isset gcc45] && ![variant_isset gcc48]} {
+    if {![variant_isset gcc43] && ![variant_isset gcc44] && ![variant_isset gcc45] &&
+        ![variant_isset gcc47] && ![variant_isset gcc48]} {
         default_variants +gcc47
     }
-    if {![variant_isset gcc43] && ![variant_isset gcc44] &&
-        ![variant_isset gcc45] && ![variant_isset gcc48]} {
+    if {![variant_isset gcc43] && ![variant_isset gcc44] && ![variant_isset gcc45] &&
+        ![variant_isset gcc47] && ![variant_isset gcc48]} {
         ui_error "\n\nA +gcc4X variant must be selected; the variant '-gcc47' cannot be used alone.\n"
         return -code error "Invalid variant selection"
     }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140608/cbb976bc/attachment.html>