[89959] trunk/dports/lang

jeremyhu at macports.org jeremyhu at macports.org
Thu Feb 16 22:32:11 PST 2012


Revision: 89959
          http://trac.macports.org/changeset/89959
Author:   jeremyhu at macports.org
Date:     2012-02-16 22:32:10 -0800 (Thu, 16 Feb 2012)
Log Message:
-----------
clang-*: Disable arm targets in the compiler runtime if the build toolchain does not support arm.  #33272

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-17 05:47:52 UTC (rev 89958)
+++ trunk/dports/lang/clang-2.9/Portfile	2012-02-17 06:32:10 UTC (rev 89959)
@@ -91,6 +91,14 @@
     system "cd ${worksrcpath}/projects && svn co -r ${compiler_rt_rev} http://llvm.org/svn/llvm-project/compiler-rt/trunk compiler-rt"
 }
 
+post-patch {
+    # http://trac.macports.org/ticket/33272
+    if {[vercmp $xcodeversion 4.1] < 0} {
+        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
+    }
+}
+
 variant analyzer description {Install clang static analyzer} {
     depends_run-append  bin:python:python26 bin:perl:perl5
     post-patch {

Modified: trunk/dports/lang/clang-3.0/Portfile
===================================================================
--- trunk/dports/lang/clang-3.0/Portfile	2012-02-17 05:47:52 UTC (rev 89958)
+++ trunk/dports/lang/clang-3.0/Portfile	2012-02-17 06:32:10 UTC (rev 89959)
@@ -91,6 +91,14 @@
     system "cd ${worksrcpath}/projects && svn co -r ${compiler_rt_rev} http://llvm.org/svn/llvm-project/compiler-rt/branches/release_30 compiler-rt"
 }
 
+post-patch {
+    # http://trac.macports.org/ticket/33272
+    if {[vercmp $xcodeversion 4.1] < 0} {
+        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
+    }
+}
+
 variant analyzer description {Install clang static analyzer} {
     depends_run-append  bin:python:python26 bin:perl:perl5
     post-patch {

Modified: trunk/dports/lang/clang-3.1/Portfile
===================================================================
--- trunk/dports/lang/clang-3.1/Portfile	2012-02-17 05:47:52 UTC (rev 89958)
+++ trunk/dports/lang/clang-3.1/Portfile	2012-02-17 06:32:10 UTC (rev 89959)
@@ -83,6 +83,14 @@
     system "cd ${worksrcpath}/projects && svn co -r ${compiler_rt_rev} http://llvm.org/svn/llvm-project/compiler-rt/trunk compiler-rt"
 }
 
+post-patch {
+    # http://trac.macports.org/ticket/33272
+    if {[vercmp $xcodeversion 4.1] < 0} {
+        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
+    }
+}
+
 variant analyzer description {Install clang static analyzer} {
     depends_run-append  bin:python:python26 bin:perl:perl5
     post-patch {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120216/5fc5cdeb/attachment-0001.html>


More information about the macports-changes mailing list