[131396] trunk/dports/lang/llvm-3.6

jeremyhu at macports.org jeremyhu at macports.org
Sat Jan 10 20:19:32 PST 2015


Revision: 131396
          https://trac.macports.org/changeset/131396
Author:   jeremyhu at macports.org
Date:     2015-01-10 20:19:32 -0800 (Sat, 10 Jan 2015)
Log Message:
-----------
clang-3.6: Build fix for Leopard

Modified Paths:
--------------
    trunk/dports/lang/llvm-3.6/Portfile

Added Paths:
-----------
    trunk/dports/lang/llvm-3.6/files/leopard-no-asan.patch

Modified: trunk/dports/lang/llvm-3.6/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.6/Portfile	2015-01-10 21:57:25 UTC (rev 131395)
+++ trunk/dports/lang/llvm-3.6/Portfile	2015-01-11 04:19:32 UTC (rev 131396)
@@ -206,7 +206,7 @@
     }
 
     if {${subport} eq "clang-${llvm_version}" && ${os.major} <= 9} {
-        patchfiles-append 0001-Leopard-Default-to-fno-blocks.patch
+        patchfiles-append leopard-no-asan.patch 0001-Leopard-Default-to-fno-blocks.patch
     }
 }
 

Added: trunk/dports/lang/llvm-3.6/files/leopard-no-asan.patch
===================================================================
--- trunk/dports/lang/llvm-3.6/files/leopard-no-asan.patch	                        (rev 0)
+++ trunk/dports/lang/llvm-3.6/files/leopard-no-asan.patch	2015-01-11 04:19:32 UTC (rev 131396)
@@ -0,0 +1,36 @@
+--- a/projects/compiler-rt/make/platform/clang_darwin.mk.orig	2015-01-10 03:41:48.000000000 -0800
++++ b/projects/compiler-rt/make/platform/clang_darwin.mk	2015-01-10 04:13:39.000000000 -0800
+@@ -114,14 +114,14 @@ UniversalArchs.profile_ios := $(call Che
+ UniversalArchs.profile_ios += $(call CheckArches,armv7 arm64,profile_ios,$(IOS_SDK))
+ 
+ # Configurations which define the ASAN support functions.
+-Configs += asan_osx_dynamic
+-UniversalArchs.asan_osx_dynamic := $(call CheckArches,i386 x86_64 x86_64h,asan_osx_dynamic,$(OSX_SDK))
++#Configs += asan_osx_dynamic
++#UniversalArchs.asan_osx_dynamic := $(call CheckArches,i386 x86_64 x86_64h,asan_osx_dynamic,$(OSX_SDK))
+ 
+-Configs += asan_iossim_dynamic
+-UniversalArchs.asan_iossim_dynamic := $(call CheckArches,i386 x86_64,asan_iossim_dynamic,$(IOSSIM_SDK))
++#Configs += asan_iossim_dynamic
++#UniversalArchs.asan_iossim_dynamic := $(call CheckArches,i386 x86_64,asan_iossim_dynamic,$(IOSSIM_SDK))
+ 
+-Configs += ubsan_osx
+-UniversalArchs.ubsan_osx := $(call CheckArches,i386 x86_64 x86_64h,ubsan_osx,$(OSX_SDK))
++#Configs += ubsan_osx
++#UniversalArchs.ubsan_osx := $(call CheckArches,i386 x86_64 x86_64h,ubsan_osx,$(OSX_SDK))
+ 
+ # Darwin 10.6 has a bug in cctools that makes it unable to use ranlib on our ARM
+ # object files. If we are on that platform, strip out all ARM archs. We still
+--- a/tools/clang/runtime/compiler-rt/Makefile.orig	2015-01-08 23:42:54.000000000 -0800
++++ b/tools/clang/runtime/compiler-rt/Makefile	2015-01-10 04:13:59.000000000 -0800
+@@ -78,9 +78,7 @@ ifeq ($(OS),Darwin)
+ RuntimeDirs += darwin macho_embedded
+ RuntimeLibrary.darwin.Configs := \
+ 	eprintf.a 10.4.a osx.a cc_kext.a \
+-	asan_osx_dynamic.dylib \
+-	profile_osx.a \
+-	ubsan_osx.a
++	profile_osx.a
+ 
+ XCRunSdkPath = \
+   $(shell \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150110/7483b3dc/attachment.html>


More information about the macports-changes mailing list