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

michaelld at macports.org michaelld at macports.org
Sun Jun 8 11:51:40 PDT 2014


Revision: 120827
          https://trac.macports.org/changeset/120827
Author:   michaelld at macports.org
Date:     2014-06-08 11:51:39 -0700 (Sun, 08 Jun 2014)
Log Message:
-----------
swig-gcj: add +gcc48 variant; add check that -gcc47 is not used alone.

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

Modified: trunk/dports/devel/swig/Portfile
===================================================================
--- trunk/dports/devel/swig/Portfile	2014-06-08 18:45:26 UTC (rev 120826)
+++ trunk/dports/devel/swig/Portfile	2014-06-08 18:51:39 UTC (rev 120827)
@@ -89,21 +89,21 @@
 }
 
 subport swig-gcj {
-    variant gcc43 conflicts gcc44 gcc45 gcc47 description {build using GCJ 4.3} {
+    variant gcc43 conflicts gcc44 gcc45 gcc47 gcc48 description {build using GCJ 4.3} {
         depends_lib-delete port:gcc47
         depends_lib-append port:gcc43
         configure.args-delete --with-gcj=${prefix}/bin/gcj-mp-4.7 --with-gcjh=${prefix}/bin/gcjh-mp-4.7
         configure.args-append --with-gcj=${prefix}/bin/gcj-mp-4.3 --with-gcjh=${prefix}/bin/gcjh-mp-4.3
     }
 
-    variant gcc44 conflicts gcc43 gcc45 gcc47 description {build using GCJ 4.4} {
+    variant gcc44 conflicts gcc43 gcc45 gcc47 gcc48 description {build using GCJ 4.4} {
         depends_lib-delete port:gcc47
         depends_lib-append port:gcc44
         configure.args-delete --with-gcj=${prefix}/bin/gcj-mp-4.7 --with-gcjh=${prefix}/bin/gcjh-mp-4.7
         configure.args-append --with-gcj=${prefix}/bin/gcj-mp-4.4 --with-gcjh=${prefix}/bin/gcjh-mp-4.4
     }
 
-    variant gcc45 conflicts gcc43 gcc44 gcc47 description {build using GCJ 4.5} {
+    variant gcc45 conflicts gcc43 gcc44 gcc47 gcc48 description {build using GCJ 4.5} {
         depends_lib-delete port:gcc47
         depends_lib-append port:gcc45
         configure.args-delete --with-gcj=${prefix}/bin/gcj-mp-4.7 --with-gcjh=${prefix}/bin/gcjh-mp-4.7
@@ -112,12 +112,25 @@
 
     # No +gcc46 because the gcc46 port does not build GCJ.
 
+    variant gcc48 conflicts gcc43 gcc44 gcc45 gcc47 description {build using GCJ 4.8} {
+        depends_lib-delete port:gcc47
+        depends_lib-append port:gcc48
+        configure.args-delete --with-gcj=${prefix}/bin/gcj-mp-4.7 --with-gcjh=${prefix}/bin/gcjh-mp-4.7
+        configure.args-append --with-gcj=${prefix}/bin/gcj-mp-4.8 --with-gcjh=${prefix}/bin/gcjh-mp-4.8
+    }
+
     # Placeholder variant for the default.
-    variant gcc47 conflicts gcc43 gcc44 gcc45 description {build using GCJ 4.7} {}
+    variant gcc47 conflicts gcc43 gcc44 gcc45 gcc48 description {build using GCJ 4.7} {}
 
-    if {![variant_isset gcc43] && ![variant_isset gcc44] && ![variant_isset gcc45]} {
+    if {![variant_isset gcc43] && ![variant_isset gcc44] &&
+        ![variant_isset gcc45] && ![variant_isset gcc48]} {
         default_variants +gcc47
     }
+    if {![variant_isset gcc43] && ![variant_isset gcc44] &&
+        ![variant_isset gcc45] && ![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"
+    }
 }
 
 if {${swig.lang} == ""} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140608/580374a9/attachment.html>


More information about the macports-changes mailing list