[129515] trunk/dports/lang/llvm-3.6/files

[larryv at macports.org]

Revision: 129515
          https://trac.macports.org/changeset/129515
Author:   larryv at macports.org
Date:     2014-12-14 23:54:56 -0800 (Sun, 14 Dec 2014)
Log Message:
-----------
{clang,llvm}-3.6: Refresh patches

Modified Paths:
--------------
    trunk/dports/lang/llvm-3.6/files/0001-Comment-out-SL-cctools-workaround.patch
    trunk/dports/lang/llvm-3.6/files/fix-libclang_rt-dylib-ids.patch
    trunk/dports/lang/llvm-3.6/files/scan-build-PR-35006.patch

Modified: trunk/dports/lang/llvm-3.6/files/0001-Comment-out-SL-cctools-workaround.patch
===================================================================
--- trunk/dports/lang/llvm-3.6/files/0001-Comment-out-SL-cctools-workaround.patch	2014-12-15 07:54:50 UTC (rev 129514)
+++ trunk/dports/lang/llvm-3.6/files/0001-Comment-out-SL-cctools-workaround.patch	2014-12-15 07:54:56 UTC (rev 129515)
@@ -1,6 +1,8 @@
---- a/projects/compiler-rt/make/platform/clang_darwin.mk
-+++ a/projects/compiler-rt/make/platform/clang_darwin.mk
-@@ -47,11 +47,11 @@ XCRunSdkPath = \
+Index: llvm-3.6svn/projects/compiler-rt/make/platform/clang_darwin.mk
+===================================================================
+--- llvm-3.6svn.orig/projects/compiler-rt/make/platform/clang_darwin.mk
++++ llvm-3.6svn/projects/compiler-rt/make/platform/clang_darwin.mk
+@@ -53,11 +53,11 @@ XCRunSdkPath = \
  
  CC       := $(call XCRun,clang)
  LD       := $(shell $(CC) -print-prog-name=ld)
@@ -15,9 +17,9 @@
 +LIPO     := @@PREFIX@@/bin/lipo
 +DSYMUTIL := @@PREFIX@@/bin/dsymutil
  
- Configs :=
- UniversalArchs :=
-@@ -83,12 +83,12 @@ UniversalArchs.ubsan_osx := $(call Check
+ OSX_SDK := $(call XCRunSdkPath,macosx)
+ IOS_SDK := $(call XCRunSdkPath,iphoneos)
+@@ -122,12 +122,12 @@ UniversalArchs.ubsan_osx := $(call Check
  # object files. If we are on that platform, strip out all ARM archs. We still
  # build the libraries themselves so that Clang can find them where it expects
  # them, even though they might not have an expected slice.
@@ -36,8 +38,10 @@
  
  # If RC_SUPPORTED_ARCHS is defined, treat it as a list of the architectures we
  # are intended to support and limit what we try to build to that.
---- a/projects/compiler-rt/make/platform/clang_macho_embedded.mk	2014-03-03 10:11:37.000000000 -0800
-+++ a/projects/compiler-rt/make/platform/clang_macho_embedded.mk	2014-03-03 12:08:37.000000000 -0800
+Index: llvm-3.6svn/projects/compiler-rt/make/platform/clang_macho_embedded.mk
+===================================================================
+--- llvm-3.6svn.orig/projects/compiler-rt/make/platform/clang_macho_embedded.mk
++++ llvm-3.6svn/projects/compiler-rt/make/platform/clang_macho_embedded.mk
 @@ -33,11 +33,11 @@ XCRun = \
  ###
  

Modified: trunk/dports/lang/llvm-3.6/files/fix-libclang_rt-dylib-ids.patch
===================================================================
--- trunk/dports/lang/llvm-3.6/files/fix-libclang_rt-dylib-ids.patch	2014-12-15 07:54:50 UTC (rev 129514)
+++ trunk/dports/lang/llvm-3.6/files/fix-libclang_rt-dylib-ids.patch	2014-12-15 07:54:56 UTC (rev 129515)
@@ -1,8 +1,8 @@
-diff --git a/tools/clang/runtime/compiler-rt/Makefile b/tools/clang/runtime/compiler-rt/Makefile
-index f06ef99..ca9bcd9 100644
---- a/tools/clang/runtime/compiler-rt/Makefile
-+++ b/tools/clang/runtime/compiler-rt/Makefile
-@@ -234,6 +234,7 @@ $(PROJ_resources_lib)/$1/libclang_rt.%.dylib: \
+Index: llvm-3.6svn/tools/clang/runtime/compiler-rt/Makefile
+===================================================================
+--- llvm-3.6svn.orig/tools/clang/runtime/compiler-rt/Makefile
++++ llvm-3.6svn/tools/clang/runtime/compiler-rt/Makefile
+@@ -235,6 +235,7 @@ $(PROJ_resources_lib)/$1/libclang_rt.%.d
  		$(ResourceLibDir)/$1/libclang_rt.%.dylib | $(PROJ_resources_lib)/$1
  	$(Echo) Installing compiler runtime library: $1/$$*
  	$(Verb) $(DataInstall) $$< $(PROJ_resources_lib)/$1

Modified: trunk/dports/lang/llvm-3.6/files/scan-build-PR-35006.patch
===================================================================
--- trunk/dports/lang/llvm-3.6/files/scan-build-PR-35006.patch	2014-12-15 07:54:50 UTC (rev 129514)
+++ trunk/dports/lang/llvm-3.6/files/scan-build-PR-35006.patch	2014-12-15 07:54:56 UTC (rev 129515)
@@ -1,6 +1,8 @@
---- a/tools/clang/tools/scan-build/scan-build.orig	2012-07-12 09:47:19.000000000 -0700
-+++ b/tools/clang/tools/scan-build/scan-build	2012-07-12 09:49:15.000000000 -0700
-@@ -1399,6 +1399,8 @@ if (defined $OutputFormat) {
+Index: llvm-3.6svn/tools/clang/tools/scan-build/scan-build
+===================================================================
+--- llvm-3.6svn.orig/tools/clang/tools/scan-build/scan-build
++++ llvm-3.6svn/tools/clang/tools/scan-build/scan-build
+@@ -1728,6 +1728,8 @@ if (defined $OutputFormat) {
        Diag "Analysis run complete.\n";
        Diag "Viewing analysis results in '$HtmlDir' using scan-view.\n";
        my $ScanView = Cwd::realpath("$RealBin/scan-view");
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141214/af91f7ef/attachment.html>