[131791] trunk/dports/lang/llvm-3.5

jeremyhu at macports.org jeremyhu at macports.org
Sun Jan 18 10:56:27 PST 2015


Revision: 131791
          https://trac.macports.org/changeset/131791
Author:   jeremyhu at macports.org
Date:     2015-01-18 10:56:27 -0800 (Sun, 18 Jan 2015)
Log Message:
-----------
llvm-3.5: Simplify -arm_runtime variant

Modified Paths:
--------------
    trunk/dports/lang/llvm-3.5/Portfile
    trunk/dports/lang/llvm-3.5/files/leopard-no-asan.patch

Added Paths:
-----------
    trunk/dports/lang/llvm-3.5/files/disable-arm-runtime.patch

Modified: trunk/dports/lang/llvm-3.5/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.5/Portfile	2015-01-18 18:18:33 UTC (rev 131790)
+++ trunk/dports/lang/llvm-3.5/Portfile	2015-01-18 18:56:27 UTC (rev 131791)
@@ -150,6 +150,11 @@
 #       Introduces a failure during build (-arch ?? passed to ld), to be investigated:
 #       1005-Call-powerpc-darwin-external-tools-with-arch-ppc.patch \
 
+    if {![variant_isset arm_runtime]} {
+        # Alternate fix for #33272.
+        patchfiles-append   disable-arm-runtime.patch
+    }
+
     build.target        clang-only
     destroot.target     install-clang
 }
@@ -280,15 +285,6 @@
 
 post-patch {
     if {${subport} eq "clang-${llvm_version}"} {
-        # http://trac.macports.org/ticket/33272
-        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 {/cc_kext_ios5/ s/^/#/} ${worksrcpath}/projects/compiler-rt/make/platform/clang_darwin.mk
-            reinplace {s/cc_kext_ios5.a//} ${worksrcpath}/tools/clang/runtime/compiler-rt/Makefile
-        }
-
         reinplace {s/VERBOSE := 0/VERBOSE := 1/} ${worksrcpath}/projects/compiler-rt/make/config.mk
 
         reinplace "s|@@PREFIX@@|${prefix}|g" \

Added: trunk/dports/lang/llvm-3.5/files/disable-arm-runtime.patch
===================================================================
--- trunk/dports/lang/llvm-3.5/files/disable-arm-runtime.patch	                        (rev 0)
+++ trunk/dports/lang/llvm-3.5/files/disable-arm-runtime.patch	2015-01-18 18:56:27 UTC (rev 131791)
@@ -0,0 +1,14 @@
+--- a/tools/clang/runtime/compiler-rt/Makefile
++++ b/tools/clang/runtime/compiler-rt/Makefile
+@@ -81,9 +81,9 @@ RuntimeDirs :=
+ ifeq ($(OS),Darwin)
+ RuntimeDirs += darwin macho_embedded
+ RuntimeLibrary.darwin.Configs := \
+-	eprintf.a 10.4.a osx.a ios.a cc_kext.a cc_kext_ios5.a \
++	eprintf.a 10.4.a osx.a cc_kext.a \
+ 	asan_osx_dynamic.dylib \
+-	profile_osx.a profile_ios.a \
++	profile_osx.a \
+ 	ubsan_osx.a
+ 
+ RuntimeLibrary.macho_embedded.Configs := \

Modified: trunk/dports/lang/llvm-3.5/files/leopard-no-asan.patch
===================================================================
--- trunk/dports/lang/llvm-3.5/files/leopard-no-asan.patch	2015-01-18 18:18:33 UTC (rev 131790)
+++ trunk/dports/lang/llvm-3.5/files/leopard-no-asan.patch	2015-01-18 18:56:27 UTC (rev 131791)
@@ -22,11 +22,11 @@
 @@ -82,9 +82,7 @@ ifeq ($(OS),Darwin)
  RuntimeDirs += darwin macho_embedded
  RuntimeLibrary.darwin.Configs := \
- 	eprintf.a 10.4.a osx.a ios.a cc_kext.a cc_kext_ios5.a \
+ 	eprintf.a 10.4.a osx.a cc_kext.a \
 -	asan_osx_dynamic.dylib \
--	profile_osx.a profile_ios.a \
+-	profile_osx.a \
 -	ubsan_osx.a
-+	profile_osx.a profile_ios.a
++	profile_osx.a
  
  RuntimeLibrary.macho_embedded.Configs := \
  	hard_static.a hard_pic.a
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150118/d7f14936/attachment.html>


More information about the macports-changes mailing list