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

[jeremyhu at macports.org]

Revision: 131393
          https://trac.macports.org/changeset/131393
Author:   jeremyhu at macports.org
Date:     2015-01-10 12:53:49 -0800 (Sat, 10 Jan 2015)
Log Message:
-----------
clang-3.5: Build fix for Leopard

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

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

Modified: trunk/dports/lang/llvm-3.5/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.5/Portfile	2015-01-10 19:20:57 UTC (rev 131392)
+++ trunk/dports/lang/llvm-3.5/Portfile	2015-01-10 20:53:49 UTC (rev 131393)
@@ -222,8 +222,8 @@
         configure.optflags    -Os
     }
 
-    if {${subport} eq "clang-${llvm_version}" && ${os.major} <= 9} {
-        patchfiles-append 0001-Leopard-Default-to-fno-blocks.patch
+    if {${subport} == "clang-${llvm_version}" && ${os.major} <= 9} {
+        patchfiles-append leopard-no-asan.patch 0001-Leopard-Default-to-fno-blocks.patch
     }
 
     # TODO: The llvm build system sets a 10.1 deployment target on Yosemite

Added: trunk/dports/lang/llvm-3.5/files/leopard-no-asan.patch
===================================================================
--- trunk/dports/lang/llvm-3.5/files/leopard-no-asan.patch	                        (rev 0)
+++ trunk/dports/lang/llvm-3.5/files/leopard-no-asan.patch	2015-01-10 20:53:49 UTC (rev 131393)
@@ -0,0 +1,37 @@
+--- a/projects/compiler-rt/make/platform/clang_darwin.mk.orig	2015-01-10 03:53:30.000000000 -0800
++++ b/projects/compiler-rt/make/platform/clang_darwin.mk	2015-01-10 04:07:11.000000000 -0800
+@@ -96,8 +96,8 @@ Configs += profile_ios
+ UniversalArchs.profile_ios := $(call CheckArches,i386 x86_64 x86_64h )
+ 
+ # 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)
++#Configs += asan_osx_dynamic
++#UniversalArchs.asan_osx_dynamic := $(call CheckArches,i386 x86_64 x86_64h,asan_osx_dynamic)
+ 
+ IOSSIM_SDK_PATH := $(call XCRunSdkPath,iphonesimulator)
+ ifneq ($(IOSSIM_SDK_PATH),)
+@@ -105,8 +105,8 @@ Configs += asan_iossim_dynamic
+ UniversalArchs.asan_iossim_dynamic := $(call CheckArches,i386 x86_64 x86_64h,asan_iossim_dynamic)
+ endif
+ 
+-Configs += ubsan_osx
+-UniversalArchs.ubsan_osx := $(call CheckArches,i386 x86_64 x86_64h,ubsan_osx)
++#Configs += ubsan_osx
++#UniversalArchs.ubsan_osx := $(call CheckArches,i386 x86_64 x86_64h,ubsan_osx)
+ 
+ # 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-10 04:34:06.000000000 -0800
++++ b/tools/clang/runtime/compiler-rt/Makefile	2015-01-10 04:35:55.000000000 -0800
+@@ -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 \
+-	asan_osx_dynamic.dylib \
+-	profile_osx.a profile_ios.a \
+-	ubsan_osx.a
++	profile_osx.a profile_ios.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/20150110/3ee9efc3/attachment.html>