[115699] trunk/dports/lang

[jeremyhu at macports.org]

Revision: 115699
          https://trac.macports.org/changeset/115699
Author:   jeremyhu at macports.org
Date:     2014-01-08 23:49:02 -0800 (Wed, 08 Jan 2014)
Log Message:
-----------
llvm-3.[45]: Revert r115581

Using gmake did not help the parallel build issue on Snow Leopard and Leopard, so reverting.

Revision Links:
--------------
    https://trac.macports.org/changeset/115581

Modified Paths:
--------------
    trunk/dports/lang/llvm-3.3/Portfile
    trunk/dports/lang/llvm-3.4/Portfile
    trunk/dports/lang/llvm-3.5/Portfile

Modified: trunk/dports/lang/llvm-3.3/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.3/Portfile	2014-01-09 06:47:50 UTC (rev 115698)
+++ trunk/dports/lang/llvm-3.3/Portfile	2014-01-09 07:49:02 UTC (rev 115699)
@@ -46,7 +46,7 @@
     depends_extract     bin:svn:subversion
     depends_skip_archcheck-append ld64 subversion
 
-    default_variants    +analyzer
+    default_variants-append    +analyzer
 }
 
 #fetch.type              svn
@@ -256,6 +256,33 @@
     }
 }
 
+set pythonver ""
+set pythonverdot ""
+
+if {![variant_isset python25] && ![variant_isset python26]} {
+    default_variants-append +python27
+}
+
+variant python25 conflicts python26 python27 description {Use python 2.5} {
+    set pythonver 25
+    set pythonverdot 2.5
+    configure.args-append --with-python=${prefix}/bin/python2.5
+}
+
+variant python26 conflicts python25 python27 description {Use python 2.6} {
+    set pythonver 26
+    set pythonverdot 2.6
+    configure.args-append --with-python=${prefix}/bin/python2.6
+}
+
+variant python27 conflicts python25 python26 description {Use python 2.7} {
+    set pythonver 27
+    set pythonverdot 2.7
+    configure.args-append --with-python=${prefix}/bin/python2.7
+}
+
+
+
 if {${subport} == "llvm-${llvm_version}"} {
     variant ocaml description {Enable generation of OCaml binding} {
         depends_lib-append   port:ocaml
@@ -268,31 +295,6 @@
 } elseif {${subport} == "clang-${llvm_version}"} {
     variant arm_runtime description {Build and install the arm runtime for iOS development (requires iOS SDK)} {}
 
-    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
-        configure.args-append --with-python=${prefix}/bin/python2.5
-    }
-
-    variant python26 conflicts python25 python27 description {Use python 2.6} {
-        set pythonver 26
-        set pythonverdot 2.6
-        configure.args-append --with-python=${prefix}/bin/python2.6
-    }
-
-    variant python27 conflicts python25 python26 description {Use python 2.7} {
-        set pythonver 27
-        set pythonverdot 2.7
-        configure.args-append --with-python=${prefix}/bin/python2.7
-    }
-
     variant analyzer description {Install clang static analyzer} {
         if {[string equal "${pythonver}" ""]} {
             ui_error "You mush select a python variant to use the clang static analyzer (+analyzer)"

Modified: trunk/dports/lang/llvm-3.4/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.4/Portfile	2014-01-09 06:47:50 UTC (rev 115698)
+++ trunk/dports/lang/llvm-3.4/Portfile	2014-01-09 07:49:02 UTC (rev 115699)
@@ -177,13 +177,6 @@
         patchfiles-append leopard-no-asan.patch
     }
 
-    if {${os.major} < 11} {
-        # Tiger's DevTools make has issues with the nested ifs in compiler-rt
-        # Our SnowLeopard buildbot seems to be running into parallel build issues
-        depends_run-append      port:gmake
-        build.cmd               ${prefix}/bin/gmake
-    }
-
     if {${os.major} < 10} {
         post-patch {
             reinplace "/TARGETS_TO_BUILD=/s/R600//" ${worksrcpath}/configure
@@ -191,6 +184,10 @@
     }
 
     if {${os.major} < 9} {
+        # Tiger's DevTools make has issues with the nested ifs in compiler-rt
+        depends_run-append      port:gmake
+        build.cmd               ${prefix}/bin/gmake
+
         post-configure {
             reinplace "/^RPATH/s/=.*/=/" ${worksrcpath}/Makefile.config
         }

Modified: trunk/dports/lang/llvm-3.5/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.5/Portfile	2014-01-09 06:47:50 UTC (rev 115698)
+++ trunk/dports/lang/llvm-3.5/Portfile	2014-01-09 07:49:02 UTC (rev 115699)
@@ -161,13 +161,6 @@
         patchfiles-append leopard-no-asan.patch
     }
 
-    if {${os.major} < 11} {
-        # Tiger's DevTools make has issues with the nested ifs in compiler-rt
-        # Our SnowLeopard buildbot seems to be running into parallel build issues
-        depends_run-append      port:gmake
-        build.cmd               ${prefix}/bin/gmake
-    }
-
     if {${os.major} < 10} {
         post-patch {
             reinplace "/TARGETS_TO_BUILD=/s/R600//" ${worksrcpath}/configure
@@ -175,6 +168,10 @@
     }
 
     if {${os.major} < 9} {
+        # Tiger's DevTools make has issues with the nested ifs in compiler-rt
+        depends_run-append      port:gmake
+        build.cmd               ${prefix}/bin/gmake
+
         post-configure {
             reinplace "/^RPATH/s/=.*/=/" ${worksrcpath}/Makefile.config
         }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140108/4a2961e5/attachment-0001.html>