[89989] trunk/dports/lang

[jeremyhu at macports.org]

Revision: 89989
          http://trac.macports.org/changeset/89989
Author:   jeremyhu at macports.org
Date:     2012-02-18 12:05:45 -0800 (Sat, 18 Feb 2012)
Log Message:
-----------
clang-*: Use a variant to turn on building the arm runtime.  #33272 #33288

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

Modified: trunk/dports/lang/clang-2.9/Portfile
===================================================================
--- trunk/dports/lang/clang-2.9/Portfile	2012-02-18 19:55:13 UTC (rev 89988)
+++ trunk/dports/lang/clang-2.9/Portfile	2012-02-18 20:05:45 UTC (rev 89989)
@@ -91,11 +91,14 @@
     system "cd ${worksrcpath}/projects && svn co -r ${compiler_rt_rev} http://llvm.org/svn/llvm-project/compiler-rt/trunk compiler-rt"
 }
 
+variant arm_runtime description {Build and install the arm runtime for iOS development (requires iOS SDK)} {}
+
 post-patch {
     # http://trac.macports.org/ticket/33272
-    if {[vercmp $xcodeversion 4.1] < 0} {
+    if {![variant_isset arm_runtime]} {
         reinplace {/^SubDirs/ s/arm//} ${worksrcpath}/projects/compiler-rt/lib/Makefile.mk
         reinplace {/^UniversalArchs/ s/arm[^ )]* *//g} ${worksrcpath}/projects/compiler-rt/make/platform/clang_darwin.mk
+        reinplace {/^Configs/ s/arm[^ )]* *//g} ${worksrcpath}/projects/compiler-rt/make/platform/clang_darwin.mk
     }
 }
 

Modified: trunk/dports/lang/clang-3.0/Portfile
===================================================================
--- trunk/dports/lang/clang-3.0/Portfile	2012-02-18 19:55:13 UTC (rev 89988)
+++ trunk/dports/lang/clang-3.0/Portfile	2012-02-18 20:05:45 UTC (rev 89989)
@@ -91,9 +91,11 @@
     system "cd ${worksrcpath}/projects && svn co -r ${compiler_rt_rev} http://llvm.org/svn/llvm-project/compiler-rt/branches/release_30 compiler-rt"
 }
 
+variant arm_runtime description {Build and install the arm runtime for iOS development (requires iOS SDK)} {}
+
 post-patch {
     # http://trac.macports.org/ticket/33272
-    if {[vercmp $xcodeversion 4.1] < 0} {
+    if {![variant_isset arm_runtime]} {
         reinplace {/^SubDirs/ s/arm//} ${worksrcpath}/projects/compiler-rt/lib/Makefile.mk
         reinplace {/^UniversalArchs/ s/arm[^ )]* *//g} ${worksrcpath}/projects/compiler-rt/make/platform/clang_darwin.mk
     }

Modified: trunk/dports/lang/clang-3.1/Portfile
===================================================================
--- trunk/dports/lang/clang-3.1/Portfile	2012-02-18 19:55:13 UTC (rev 89988)
+++ trunk/dports/lang/clang-3.1/Portfile	2012-02-18 20:05:45 UTC (rev 89989)
@@ -83,9 +83,11 @@
     system "cd ${worksrcpath}/projects && svn co -r ${compiler_rt_rev} http://llvm.org/svn/llvm-project/compiler-rt/trunk compiler-rt"
 }
 
+variant arm_runtime description {Build and install the arm runtime for iOS development (requires iOS SDK)} {}
+
 post-patch {
     # http://trac.macports.org/ticket/33272
-    if {[vercmp $xcodeversion 4.1] < 0} {
+    if {![variant_isset arm_runtime]} {
         reinplace {/^SubDirs/ s/arm//} ${worksrcpath}/projects/compiler-rt/lib/Makefile.mk
         reinplace {/^UniversalArchs/ s/arm[^ )]* *//g} ${worksrcpath}/projects/compiler-rt/make/platform/clang_darwin.mk
     }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120218/01c5d72b/attachment-0001.html>