[95852] trunk/dports/lang

jeremyhu at macports.org jeremyhu at macports.org
Tue Jul 24 10:37:56 PDT 2012


Revision: 95852
          https://trac.macports.org/changeset/95852
Author:   jeremyhu at macports.org
Date:     2012-07-24 10:37:55 -0700 (Tue, 24 Jul 2012)
Log Message:
-----------
clang-*: Use python variants to choose which version of python to depend on (#35299)

Modified Paths:
--------------
    trunk/dports/lang/clang-2.9/Portfile
    trunk/dports/lang/clang-3.0/Portfile
    trunk/dports/lang/clang-3.1/Portfile
    trunk/dports/lang/clang-3.2/Portfile

Modified: trunk/dports/lang/clang-2.9/Portfile
===================================================================
--- trunk/dports/lang/clang-2.9/Portfile	2012-07-24 17:24:21 UTC (rev 95851)
+++ trunk/dports/lang/clang-2.9/Portfile	2012-07-24 17:37:55 UTC (rev 95852)
@@ -162,14 +162,42 @@
     }
 }
 
+set pythonver ""
+set pythonverdot ""
+
+if {![variant_isset python25] && ![variant_isset python26]} {
+    default_variants +python27
+}
+
+variant python25 conflicts python26 python27 description {Use python 2.5} {
+    set pythonver 25
+    set pythonverdot 2.5
+}
+
+variant python26 conflicts python25 python27 description {Use python 2.6} {
+    set pythonver 26
+    set pythonverdot 2.6
+}
+
+variant python27 conflicts python25 python26 description {Use python 2.7} {
+    set pythonver 27
+    set pythonverdot 2.7
+}
+
 variant analyzer description {Install clang static analyzer} {
-    depends_run-append  port:python26 port:perl5
+    if {[string equal "${pythonver}" ""]} {
+        ui_error "You mush select a python variant to use the clang static analyzer (+analyzer)"
+        error "Invalid variant combination"
+    }
+
+    depends_run-append port:perl5 port:python${pythonver}
+
     post-patch {
         reinplace "s|/usr/bin/env perl|${prefix}/bin/perl5|g" \
             ${worksrcpath}/tools/clang/tools/scan-build/ccc-analyzer \
             ${worksrcpath}/tools/clang/tools/scan-build/c++-analyzer \
             ${worksrcpath}/tools/clang/tools/scan-build/scan-build
-        reinplace "s|/usr/bin/env python|${prefix}/bin/python2.6|g" \
+        reinplace "s|/usr/bin/env python|${prefix}/bin/python${pythonverdot}|g" \
             ${worksrcpath}/tools/clang/tools/scan-build/set-xcode-analyzer \
             ${worksrcpath}/tools/clang/tools/scan-view/scan-view
     }

Modified: trunk/dports/lang/clang-3.0/Portfile
===================================================================
--- trunk/dports/lang/clang-3.0/Portfile	2012-07-24 17:24:21 UTC (rev 95851)
+++ trunk/dports/lang/clang-3.0/Portfile	2012-07-24 17:37:55 UTC (rev 95852)
@@ -160,14 +160,42 @@
     }
 }
 
+set pythonver ""
+set pythonverdot ""
+
+if {![variant_isset python25] && ![variant_isset python26]} {
+    default_variants +python27
+}
+
+variant python25 conflicts python26 python27 description {Use python 2.5} {
+    set pythonver 25
+    set pythonverdot 2.5
+}
+
+variant python26 conflicts python25 python27 description {Use python 2.6} {
+    set pythonver 26
+    set pythonverdot 2.6
+}
+
+variant python27 conflicts python25 python26 description {Use python 2.7} {
+    set pythonver 27
+    set pythonverdot 2.7
+}
+
 variant analyzer description {Install clang static analyzer} {
-    depends_run-append  port:python26 port:perl5
+    if {[string equal "${pythonver}" ""]} {
+        ui_error "You mush select a python variant to use the clang static analyzer (+analyzer)"
+        error "Invalid variant combination"
+    }
+
+    depends_run-append port:perl5 port:python${pythonver}
+
     post-patch {
         reinplace "s|/usr/bin/env perl|${prefix}/bin/perl5|g" \
             ${worksrcpath}/tools/clang/tools/scan-build/ccc-analyzer \
             ${worksrcpath}/tools/clang/tools/scan-build/c++-analyzer \
             ${worksrcpath}/tools/clang/tools/scan-build/scan-build
-        reinplace "s|/usr/bin/env python|${prefix}/bin/python2.6|g" \
+        reinplace "s|/usr/bin/env python|${prefix}/bin/python${pythonverdot}|g" \
             ${worksrcpath}/tools/clang/tools/scan-build/set-xcode-analyzer \
             ${worksrcpath}/tools/clang/tools/scan-view/scan-view
     }

Modified: trunk/dports/lang/clang-3.1/Portfile
===================================================================
--- trunk/dports/lang/clang-3.1/Portfile	2012-07-24 17:24:21 UTC (rev 95851)
+++ trunk/dports/lang/clang-3.1/Portfile	2012-07-24 17:37:55 UTC (rev 95852)
@@ -172,14 +172,42 @@
 
 }
 
+set pythonver ""
+set pythonverdot ""
+
+if {![variant_isset python25] && ![variant_isset python26]} {
+    default_variants +python27
+}
+
+variant python25 conflicts python26 python27 description {Use python 2.5} {
+    set pythonver 25
+    set pythonverdot 2.5
+}
+
+variant python26 conflicts python25 python27 description {Use python 2.6} {
+    set pythonver 26
+    set pythonverdot 2.6
+}
+
+variant python27 conflicts python25 python26 description {Use python 2.7} {
+    set pythonver 27
+    set pythonverdot 2.7
+}
+
 variant analyzer description {Install clang static analyzer} {
-    depends_run-append  port:python26 port:perl5
+    if {[string equal "${pythonver}" ""]} {
+        ui_error "You mush select a python variant to use the clang static analyzer (+analyzer)"
+        error "Invalid variant combination"
+    }
+
+    depends_run-append port:perl5 port:python${pythonver}
+
     post-patch {
         reinplace "s|/usr/bin/env perl|${prefix}/bin/perl5|g" \
             ${worksrcpath}/tools/clang/tools/scan-build/ccc-analyzer \
             ${worksrcpath}/tools/clang/tools/scan-build/c++-analyzer \
             ${worksrcpath}/tools/clang/tools/scan-build/scan-build
-        reinplace "s|/usr/bin/env python|${prefix}/bin/python2.6|g" \
+        reinplace "s|/usr/bin/env python|${prefix}/bin/python${pythonverdot}|g" \
             ${worksrcpath}/tools/clang/tools/scan-build/set-xcode-analyzer \
             ${worksrcpath}/tools/clang/tools/scan-view/scan-view
     }

Modified: trunk/dports/lang/clang-3.2/Portfile
===================================================================
--- trunk/dports/lang/clang-3.2/Portfile	2012-07-24 17:24:21 UTC (rev 95851)
+++ trunk/dports/lang/clang-3.2/Portfile	2012-07-24 17:37:55 UTC (rev 95852)
@@ -162,14 +162,42 @@
 
 }
 
+set pythonver ""
+set pythonverdot ""
+
+if {![variant_isset python25] && ![variant_isset python26]} {
+    default_variants +python27
+}
+
+variant python25 conflicts python26 python27 description {Use python 2.5} {
+    set pythonver 25
+    set pythonverdot 2.5
+}
+
+variant python26 conflicts python25 python27 description {Use python 2.6} {
+    set pythonver 26
+    set pythonverdot 2.6
+}
+
+variant python27 conflicts python25 python26 description {Use python 2.7} {
+    set pythonver 27
+    set pythonverdot 2.7
+}
+
 variant analyzer description {Install clang static analyzer} {
-    depends_run-append  port:python26 port:perl5
+    if {[string equal "${pythonver}" ""]} {
+        ui_error "You mush select a python variant to use the clang static analyzer (+analyzer)"
+        error "Invalid variant combination"
+    }
+
+    depends_run-append port:perl5 port:python${pythonver}
+
     post-patch {
         reinplace "s|/usr/bin/env perl|${prefix}/bin/perl5|g" \
             ${worksrcpath}/tools/clang/tools/scan-build/ccc-analyzer \
             ${worksrcpath}/tools/clang/tools/scan-build/c++-analyzer \
             ${worksrcpath}/tools/clang/tools/scan-build/scan-build
-        reinplace "s|/usr/bin/env python|${prefix}/bin/python2.6|g" \
+        reinplace "s|/usr/bin/env python|${prefix}/bin/python${pythonverdot}|g" \
             ${worksrcpath}/tools/clang/tools/scan-build/set-xcode-analyzer \
             ${worksrcpath}/tools/clang/tools/scan-view/scan-view
     }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120724/cdd7f3ef/attachment-0001.html>


More information about the macports-changes mailing list