[142076] trunk/dports/lang/llvm-3.8

jeremyhu at macports.org jeremyhu at macports.org
Sat Dec 12 04:13:45 PST 2015


Revision: 142076
          https://trac.macports.org/changeset/142076
Author:   jeremyhu at macports.org
Date:     2015-11-03 00:07:07 -0800 (Tue, 03 Nov 2015)
Log Message:
-----------
llvm-3.8: Remove double install_name_tool-ing

Modified Paths:
--------------
    trunk/dports/lang/llvm-3.8/Portfile
    trunk/dports/lang/llvm-3.8/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch
    trunk/dports/lang/llvm-3.8/files/1002-MacPorts-Only-Fall-back-on-xcodebuild-sdk-when-xcrun.patch
    trunk/dports/lang/llvm-3.8/files/1003-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch

Added Paths:
-----------
    trunk/dports/lang/llvm-3.8/files/1004-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch
    trunk/dports/lang/llvm-3.8/files/1005-Default-to-ppc7400-for-OSX-10.5.patch
    trunk/dports/lang/llvm-3.8/files/1006-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch
    trunk/dports/lang/llvm-3.8/files/1007-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch

Removed Paths:
-------------
    trunk/dports/lang/llvm-3.8/files/1004-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch
    trunk/dports/lang/llvm-3.8/files/1005-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch
    trunk/dports/lang/llvm-3.8/files/1006-Default-to-ppc7400-for-OSX-10.5.patch
    trunk/dports/lang/llvm-3.8/files/1007-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch
    trunk/dports/lang/llvm-3.8/files/1008-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch

Modified: trunk/dports/lang/llvm-3.8/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.8/Portfile	2015-11-03 08:03:29 UTC (rev 142075)
+++ trunk/dports/lang/llvm-3.8/Portfile	2015-11-03 08:07:07 UTC (rev 142076)
@@ -64,7 +64,7 @@
 }
 
 fetch.type              svn
-svn.revision            251619
+svn.revision            251899
 
 set compiler_rt_rev     ${svn.revision}
 set libcxx_rev          ${svn.revision}
@@ -109,11 +109,10 @@
         1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch \
         1002-MacPorts-Only-Fall-back-on-xcodebuild-sdk-when-xcrun.patch \
         1003-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch \
-        1004-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch \
-        1005-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch \
-        1006-Default-to-ppc7400-for-OSX-10.5.patch \
-        1007-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch \
-        1008-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch \
+        1004-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch \
+        1005-Default-to-ppc7400-for-OSX-10.5.patch \
+        1006-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch \
+        1007-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch \
         2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch \
         2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch \
         2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch \
@@ -411,12 +410,6 @@
         file delete -force ${destroot}${sub_prefix}/libexec/clang-format/Release+Debug+Asserts
         file delete -force ${destroot}${sub_prefix}/libexec/clang-format/CMakeLists.txt
         file delete -force ${destroot}${sub_prefix}/libexec/clang-format/ClangFormat.cpp
-
-        set clangrtpath "${destroot}${sub_prefix}/lib/clang/${llvm_version}/lib/darwin"
-        foreach file [glob ${clangrtpath}/*.dylib] {
-            set basename [string map "${clangrtpath}/ {}" ${file}]
-            system "install_name_tool -id @rpath/${basename} ${file}"
-        }
     }
 }
 

Modified: trunk/dports/lang/llvm-3.8/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch
===================================================================
--- trunk/dports/lang/llvm-3.8/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch	2015-11-03 08:03:29 UTC (rev 142075)
+++ trunk/dports/lang/llvm-3.8/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch	2015-11-03 08:07:07 UTC (rev 142076)
@@ -1,7 +1,7 @@
-From 35e08e31bd8edfa85cf54aa63271f5777e8ac200 Mon Sep 17 00:00:00 2001
+From 3f6f89cbbbbb7868fc2c223391853732007a80d5 Mon Sep 17 00:00:00 2001
 From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
 Date: Sat, 17 Jan 2015 17:50:24 -0800
-Subject: [PATCH 1001/1008] MacPorts Only: Prepare clang-format for replacement
+Subject: [PATCH 1001/1007] MacPorts Only: Prepare clang-format for replacement
  with absolute path
 
 Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
@@ -27,7 +27,7 @@
  tell application "BBEdit"
  	-- "set contents of text document 1 to newContents" scrolls to the bottom while
 diff --git llvm_master/tools/clang/tools/clang-format/clang-format-diff.py macports_master/tools/clang/tools/clang-format/clang-format-diff.py
-index 64efb83..4371e38 100755
+index 9e02bb0..b62bef3 100755
 --- llvm_master/tools/clang/tools/clang-format/clang-format-diff.py
 +++ macports_master/tools/clang/tools/clang-format/clang-format-diff.py
 @@ -32,7 +32,7 @@ import sys
@@ -40,7 +40,7 @@
  
  def main():
 diff --git llvm_master/tools/clang/tools/clang-format/clang-format-sublime.py macports_master/tools/clang/tools/clang-format/clang-format-sublime.py
-index 16ff56e..4b68104 100644
+index 1cffcec..5c90704 100644
 --- llvm_master/tools/clang/tools/clang-format/clang-format-sublime.py
 +++ macports_master/tools/clang/tools/clang-format/clang-format-sublime.py
 @@ -18,7 +18,7 @@ import sublime_plugin
@@ -53,7 +53,7 @@
  # Change this to format according to other formatting styles. See the output of
  # 'clang-format --help' for a list of supported styles. The default looks for
 diff --git llvm_master/tools/clang/tools/clang-format/clang-format.el macports_master/tools/clang/tools/clang-format/clang-format.el
-index ca46144..1c49835 100644
+index 6de45de..523c012 100644
 --- llvm_master/tools/clang/tools/clang-format/clang-format.el
 +++ macports_master/tools/clang/tools/clang-format/clang-format.el
 @@ -36,8 +36,7 @@
@@ -67,7 +67,7 @@
  
  A string containing the name or the full path of the executable."
 diff --git llvm_master/tools/clang/tools/clang-format/clang-format.py macports_master/tools/clang/tools/clang-format/clang-format.py
-index 5cb41fc..e8a5904 100644
+index 1725e86..b88e64b 100644
 --- llvm_master/tools/clang/tools/clang-format/clang-format.py
 +++ macports_master/tools/clang/tools/clang-format/clang-format.py
 @@ -34,7 +34,7 @@ import vim
@@ -80,5 +80,5 @@
    binary = vim.eval('g:clang_format_path')
  
 -- 
-2.5.0
+2.6.2
 

Modified: trunk/dports/lang/llvm-3.8/files/1002-MacPorts-Only-Fall-back-on-xcodebuild-sdk-when-xcrun.patch
===================================================================
--- trunk/dports/lang/llvm-3.8/files/1002-MacPorts-Only-Fall-back-on-xcodebuild-sdk-when-xcrun.patch	2015-11-03 08:03:29 UTC (rev 142075)
+++ trunk/dports/lang/llvm-3.8/files/1002-MacPorts-Only-Fall-back-on-xcodebuild-sdk-when-xcrun.patch	2015-11-03 08:07:07 UTC (rev 142076)
@@ -1,24 +1,28 @@
-From bdc1d61d9c623f3a17d917a28d77a5b19681cb12 Mon Sep 17 00:00:00 2001
+From 2d58a5970d53a83631adafb6decb9563f0623ab0 Mon Sep 17 00:00:00 2001
 From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
 Date: Sat, 17 Jan 2015 17:51:10 -0800
-Subject: [PATCH 1002/1008] MacPorts Only: Fall back on xcodebuild -sdk when
+Subject: [PATCH 1002/1007] MacPorts Only: Fall back on xcodebuild -sdk when
  xcrun --sdk is not supported
 
 Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
 ---
- runtime/compiler-rt/Makefile | 14 ++++++++++++--
- 1 file changed, 12 insertions(+), 2 deletions(-)
+ runtime/compiler-rt/Makefile | 22 ++++++++++++++++------
+ 1 file changed, 16 insertions(+), 6 deletions(-)
 
 diff --git llvm_master/tools/clang/runtime/compiler-rt/Makefile macports_master/tools/clang/runtime/compiler-rt/Makefile
-index 9976438..fc43e72 100644
+index 029fe1e..33d21cc 100644
 --- llvm_master/tools/clang/runtime/compiler-rt/Makefile
 +++ macports_master/tools/clang/runtime/compiler-rt/Makefile
-@@ -81,8 +81,18 @@ RuntimeLibrary.darwin.Configs := \
+@@ -81,12 +81,22 @@ RuntimeLibrary.darwin.Configs := \
  	profile_osx.a \
  	ubsan_osx_dynamic.dylib
  
 -IOS_SDK := $(shell xcrun --show-sdk-path -sdk iphoneos 2> /dev/null)
 -IOSSIM_SDK := $(shell xcrun --show-sdk-path -sdk iphonesimulator 2> /dev/null)
+-TVOS_SDK := $(shell xcrun --show-sdk-path -sdk appletvos 2> /dev/null)
+-TVOSSIM_SDK := $(shell xcrun --show-sdk-path -sdk appletvsimulator 2> /dev/null)
+-WATCHOS_SDK := $(shell xcrun --show-sdk-path -sdk watchos 2> /dev/null)
+-WATCHOSSIM_SDK := $(shell xcrun --show-sdk-path -sdk watchsimulator 2> /dev/null)
 +XCRunSdkPath = \
 +  $(shell \
 +    result=`xcrun --sdk $(1) --show-sdk-path 2> /dev/null`; \
@@ -31,9 +35,13 @@
 +
 +IOS_SDK := $(call XCRunSdkPath,iphoneos)
 +IOSSIM_SDK := $(call XCRunSdkPath,iphonesimulator)
++TVOS_SDK := $(call XCRunSdkPath,appletvos)
++TVOSSIM_SDK := $(call XCRunSdkPath,appletvsimulator)
++WATCHOS_SDK := $(call XCRunSdkPath,watchos)
++WATCHOSSIM_SDK := $(call XCRunSdkPath,watchsimulator)
  
- ifneq ($(IOS_SDK)$(IOSSIM_SDK),)
- RuntimeLibrary.darwin.Configs += ios.a profile_ios.a
+ LinkerSupportedArches = \
+   $(shell \
 -- 
-2.5.0
+2.6.2
 

Modified: trunk/dports/lang/llvm-3.8/files/1003-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch
===================================================================
--- trunk/dports/lang/llvm-3.8/files/1003-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch	2015-11-03 08:03:29 UTC (rev 142075)
+++ trunk/dports/lang/llvm-3.8/files/1003-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch	2015-11-03 08:07:07 UTC (rev 142076)
@@ -1,7 +1,7 @@
-From ace8a08de0d37dee6610abdd8729e69b3f0abca1 Mon Sep 17 00:00:00 2001
+From bb9925177655401f9d6e1d13adbc39984c9cd507 Mon Sep 17 00:00:00 2001
 From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
 Date: Sat, 17 Jan 2015 17:55:27 -0800
-Subject: [PATCH 1003/1008] MacPorts Only: Fix name of scan-view executable
+Subject: [PATCH 1003/1007] MacPorts Only: Fix name of scan-view executable
  inside scan-build
 
 http://trac.macports.org/ticket/35006
@@ -12,18 +12,18 @@
  1 file changed, 2 insertions(+)
 
 diff --git llvm_master/tools/clang/tools/scan-build/scan-build macports_master/tools/clang/tools/scan-build/scan-build
-index b3a4008..ff33746 100755
+index 24796c7..a7731f8 100755
 --- llvm_master/tools/clang/tools/scan-build/scan-build
 +++ macports_master/tools/clang/tools/scan-build/scan-build
-@@ -1746,6 +1746,8 @@ if (defined $OutputFormat) {
+@@ -1815,6 +1815,8 @@ if (defined $Options{OutputFormat}) {
        Diag "Analysis run complete.\n";
-       Diag "Viewing analysis results in '$HtmlDir' using scan-view.\n";
+       Diag "Viewing analysis results in '$Options{OutputDir}' using scan-view.\n";
        my $ScanView = Cwd::realpath("$RealBin/scan-view");
 +      if (! -x $ScanView) { $ScanView = Cwd::realpath("$RealBin/bin/scan-view"); }
 +      if (! -x $ScanView) { $ScanView = Cwd::realpath("$RealBin/../scan-view/scan-view"); }
        if (! -x $ScanView) { $ScanView = "scan-view"; }
-       exec $ScanView, "$HtmlDir";
+       exec $ScanView, "$Options{OutputDir}";
      }
 -- 
-2.5.0
+2.6.2
 

Deleted: trunk/dports/lang/llvm-3.8/files/1004-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch
===================================================================
--- trunk/dports/lang/llvm-3.8/files/1004-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch	2015-11-03 08:03:29 UTC (rev 142075)
+++ trunk/dports/lang/llvm-3.8/files/1004-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch	2015-11-03 08:07:07 UTC (rev 142076)
@@ -1,27 +0,0 @@
-From c488b59fabfe2ad36b04d1a1300c7cf2d7354137 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
-Date: Sat, 17 Jan 2015 17:56:44 -0800
-Subject: [PATCH 1004/1008] MacPorts Only: Fix libclang_rt dylib ids
-
-We should probably not be shipping these.
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
----
- runtime/compiler-rt/Makefile | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git llvm_master/tools/clang/runtime/compiler-rt/Makefile macports_master/tools/clang/runtime/compiler-rt/Makefile
-index fc43e72..460eece 100644
---- llvm_master/tools/clang/runtime/compiler-rt/Makefile
-+++ macports_master/tools/clang/runtime/compiler-rt/Makefile
-@@ -237,6 +237,7 @@ $(PROJ_resources_lib)/$1/libclang_rt.%.dylib: \
- 		$(ResourceLibDir)/$1/libclang_rt.%.dylib | $(PROJ_resources_lib)/$1
- 	$(Echo) Installing compiler runtime library: $1/$$*
- 	$(Verb) $(DataInstall) $$< $(PROJ_resources_lib)/$1
-+	$(Verb) install_name_tool $$@ -id $$(patsubst $(DESTDIR)%,%,$$@)
- 
- # Rule to install runtime libraries.
- RuntimeLibraryInstall.$1: \
--- 
-2.5.0
-

Added: trunk/dports/lang/llvm-3.8/files/1004-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch
===================================================================
--- trunk/dports/lang/llvm-3.8/files/1004-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch	                        (rev 0)
+++ trunk/dports/lang/llvm-3.8/files/1004-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch	2015-11-03 08:07:07 UTC (rev 142076)
@@ -0,0 +1,74 @@
+From 878d166ba7b512d22f78d23e51c7aa43f1506535 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Sat, 17 Jan 2015 17:58:25 -0800
+Subject: [PATCH 1004/1007] MacPorts Only: Relocate clang resources using llvm
+ version
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ lib/Headers/Makefile         |  3 ++-
+ runtime/compiler-rt/Makefile | 15 ++++++++++++++-
+ 2 files changed, 16 insertions(+), 2 deletions(-)
+
+diff --git llvm_master/tools/clang/lib/Headers/Makefile macports_master/tools/clang/lib/Headers/Makefile
+index 903acac..7c37992 100644
+--- llvm_master/tools/clang/lib/Headers/Makefile
++++ macports_master/tools/clang/lib/Headers/Makefile
+@@ -16,6 +16,7 @@ include $(CLANG_LEVEL)/Makefile
+ 
+ CLANG_VERSION := $(word 3,$(shell grep "CLANG_VERSION " \
+ 	$(PROJ_OBJ_DIR)/$(CLANG_LEVEL)/include/clang/Basic/Version.inc))
++LLVM_VERSION := $(LLVM_VERSION_MAJOR).$(LLVM_VERSION_MINOR)
+ 
+ HeaderDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/lib/clang/$(CLANG_VERSION)/include
+ 
+@@ -40,7 +41,7 @@ $(HeaderDir)/module.modulemap: $(PROJ_SRC_DIR)/module.modulemap $(HeaderDir)/.di
+ # Hook into the standard Makefile rules.
+ all-local:: $(OBJHEADERS) $(HeaderDir)/module.modulemap
+ 
+-PROJ_headers := $(DESTDIR)$(PROJ_prefix)/lib/clang/$(CLANG_VERSION)/include
++PROJ_headers := $(DESTDIR)$(PROJ_prefix)/lib/clang/$(LLVM_VERSION)/include
+ 
+ INSTHEADERS := $(addprefix $(PROJ_headers)/, $(HEADERS))
+ INSTHEADERS += $(PROJ_headers)/arm_neon.h
+diff --git llvm_master/tools/clang/runtime/compiler-rt/Makefile macports_master/tools/clang/runtime/compiler-rt/Makefile
+index 33d21cc..5d459f6 100644
+--- llvm_master/tools/clang/runtime/compiler-rt/Makefile
++++ macports_master/tools/clang/runtime/compiler-rt/Makefile
+@@ -18,9 +18,10 @@ include $(CLANG_LEVEL)/Makefile
+ 
+ CLANG_VERSION := $(word 3,$(shell grep "CLANG_VERSION " \
+ 	$(PROJ_OBJ_DIR)/$(CLANG_LEVEL)/include/clang/Basic/Version.inc))
++LLVM_VERSION := $(LLVM_VERSION_MAJOR).$(LLVM_VERSION_MINOR)
+ 
+ ResourceDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/lib/clang/$(CLANG_VERSION)
+-PROJ_resources := $(DESTDIR)$(PROJ_prefix)/lib/clang/$(CLANG_VERSION)
++PROJ_resources := $(DESTDIR)$(PROJ_prefix)/lib/clang/$(LLVM_VERSION)
+ 
+ ResourceLibDir := $(ResourceDir)/lib
+ ResourceIncludeDir := $(ResourceDir)/include
+@@ -292,9 +293,21 @@ $(PROJ_resources_include)/sanitizer: $(ResourceIncludeDir)/sanitizer $(PROJ_reso
+ RuntimeHeaderInstall: $(PROJ_resources_include)/sanitizer
+ .PHONY: RuntimeHeaderInstall
+ 
++# Make sure $(PROJ_resources) exists before creating the symlink.
++$(PROJ_resources:$(LLVM_VERSION)=$(CLANG_VERSION)):
++	$(Echo) Creating compiler runtime compatibility symlink
++	$(Verb) $(MKDIR) $(dir $@)
++	$(Verb) ln -s $(LLVM_VERSION) $@
++
++MacPortsClangResSymlinkInstall: $(PROJ_resources:$(LLVM_VERSION)=$(CLANG_VERSION))
++.PHONY: MacPortsClangResSymlinkInstall
++
+ # Hook into the standard Makefile rules.
+ all-local:: $(RuntimeDirs:%=RuntimeLibrary.%) RuntimeHeader
+ install-local:: $(RuntimeDirs:%=RuntimeLibraryInstall.%) RuntimeHeaderInstall
++ifneq ($(LLVM_VERSION),$(CLANG_VERSION))
++install-local:: MacPortsClangResSymlinkInstall
++endif
+ clean-local:: CleanRuntimeLibraries
+ 
+ endif
+-- 
+2.6.2
+

Added: trunk/dports/lang/llvm-3.8/files/1005-Default-to-ppc7400-for-OSX-10.5.patch
===================================================================
--- trunk/dports/lang/llvm-3.8/files/1005-Default-to-ppc7400-for-OSX-10.5.patch	                        (rev 0)
+++ trunk/dports/lang/llvm-3.8/files/1005-Default-to-ppc7400-for-OSX-10.5.patch	2015-11-03 08:07:07 UTC (rev 142076)
@@ -0,0 +1,26 @@
+From c916bf99b3046a70bcf58ee01d73a9de90a04be2 Mon Sep 17 00:00:00 2001
+From: Iain Sandoe <iain at codesourcery.com>
+Date: Sun, 27 Jul 2014 20:35:16 +0100
+Subject: [PATCH 1005/1007] Default to ppc7400 for OSX 10.5+
+
+---
+ lib/Driver/Tools.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git llvm_master/tools/clang/lib/Driver/Tools.cpp macports_master/tools/clang/lib/Driver/Tools.cpp
+index 34dfa4f..6114cd2 100644
+--- llvm_master/tools/clang/lib/Driver/Tools.cpp
++++ macports_master/tools/clang/lib/Driver/Tools.cpp
+@@ -1621,6 +1621,9 @@ static std::string getCPUName(const ArgList &Args, const llvm::Triple &T,
+         TargetCPUName = "ppc64";
+       else if (T.getArch() == llvm::Triple::ppc64le)
+         TargetCPUName = "ppc64le";
++      else if (T.isOSDarwin() && !T.isMacOSXVersionLT(10,5))
++        // For 10.5+ Altivec is assumed available.
++        TargetCPUName = "7400";
+       else
+         TargetCPUName = "ppc";
+     }
+-- 
+2.6.2
+

Deleted: trunk/dports/lang/llvm-3.8/files/1005-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch
===================================================================
--- trunk/dports/lang/llvm-3.8/files/1005-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch	2015-11-03 08:03:29 UTC (rev 142075)
+++ trunk/dports/lang/llvm-3.8/files/1005-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch	2015-11-03 08:07:07 UTC (rev 142076)
@@ -1,74 +0,0 @@
-From 707e3b757274313dbb111cd81e1f55b401a516fc Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
-Date: Sat, 17 Jan 2015 17:58:25 -0800
-Subject: [PATCH 1005/1008] MacPorts Only: Relocate clang resources using llvm
- version
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
----
- lib/Headers/Makefile         |  3 ++-
- runtime/compiler-rt/Makefile | 15 ++++++++++++++-
- 2 files changed, 16 insertions(+), 2 deletions(-)
-
-diff --git llvm_master/tools/clang/lib/Headers/Makefile macports_master/tools/clang/lib/Headers/Makefile
-index 903acac..7c37992 100644
---- llvm_master/tools/clang/lib/Headers/Makefile
-+++ macports_master/tools/clang/lib/Headers/Makefile
-@@ -16,6 +16,7 @@ include $(CLANG_LEVEL)/Makefile
- 
- CLANG_VERSION := $(word 3,$(shell grep "CLANG_VERSION " \
- 	$(PROJ_OBJ_DIR)/$(CLANG_LEVEL)/include/clang/Basic/Version.inc))
-+LLVM_VERSION := $(LLVM_VERSION_MAJOR).$(LLVM_VERSION_MINOR)
- 
- HeaderDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/lib/clang/$(CLANG_VERSION)/include
- 
-@@ -40,7 +41,7 @@ $(HeaderDir)/module.modulemap: $(PROJ_SRC_DIR)/module.modulemap $(HeaderDir)/.di
- # Hook into the standard Makefile rules.
- all-local:: $(OBJHEADERS) $(HeaderDir)/module.modulemap
- 
--PROJ_headers := $(DESTDIR)$(PROJ_prefix)/lib/clang/$(CLANG_VERSION)/include
-+PROJ_headers := $(DESTDIR)$(PROJ_prefix)/lib/clang/$(LLVM_VERSION)/include
- 
- INSTHEADERS := $(addprefix $(PROJ_headers)/, $(HEADERS))
- INSTHEADERS += $(PROJ_headers)/arm_neon.h
-diff --git llvm_master/tools/clang/runtime/compiler-rt/Makefile macports_master/tools/clang/runtime/compiler-rt/Makefile
-index 460eece..d4f23c2 100644
---- llvm_master/tools/clang/runtime/compiler-rt/Makefile
-+++ macports_master/tools/clang/runtime/compiler-rt/Makefile
-@@ -18,9 +18,10 @@ include $(CLANG_LEVEL)/Makefile
- 
- CLANG_VERSION := $(word 3,$(shell grep "CLANG_VERSION " \
- 	$(PROJ_OBJ_DIR)/$(CLANG_LEVEL)/include/clang/Basic/Version.inc))
-+LLVM_VERSION := $(LLVM_VERSION_MAJOR).$(LLVM_VERSION_MINOR)
- 
- ResourceDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/lib/clang/$(CLANG_VERSION)
--PROJ_resources := $(DESTDIR)$(PROJ_prefix)/lib/clang/$(CLANG_VERSION)
-+PROJ_resources := $(DESTDIR)$(PROJ_prefix)/lib/clang/$(LLVM_VERSION)
- 
- ResourceLibDir := $(ResourceDir)/lib
- ResourceIncludeDir := $(ResourceDir)/include
-@@ -258,9 +259,21 @@ $(PROJ_resources_include)/sanitizer: $(ResourceIncludeDir)/sanitizer $(PROJ_reso
- RuntimeHeaderInstall: $(PROJ_resources_include)/sanitizer
- .PHONY: RuntimeHeaderInstall
- 
-+# Make sure $(PROJ_resources) exists before creating the symlink.
-+$(PROJ_resources:$(LLVM_VERSION)=$(CLANG_VERSION)):
-+	$(Echo) Creating compiler runtime compatibility symlink
-+	$(Verb) $(MKDIR) $(dir $@)
-+	$(Verb) ln -s $(LLVM_VERSION) $@
-+
-+MacPortsClangResSymlinkInstall: $(PROJ_resources:$(LLVM_VERSION)=$(CLANG_VERSION))
-+.PHONY: MacPortsClangResSymlinkInstall
-+
- # Hook into the standard Makefile rules.
- all-local:: $(RuntimeDirs:%=RuntimeLibrary.%) RuntimeHeader
- install-local:: $(RuntimeDirs:%=RuntimeLibraryInstall.%) RuntimeHeaderInstall
-+ifneq ($(LLVM_VERSION),$(CLANG_VERSION))
-+install-local:: MacPortsClangResSymlinkInstall
-+endif
- clean-local:: CleanRuntimeLibraries
- 
- endif
--- 
-2.5.0
-

Deleted: trunk/dports/lang/llvm-3.8/files/1006-Default-to-ppc7400-for-OSX-10.5.patch
===================================================================
--- trunk/dports/lang/llvm-3.8/files/1006-Default-to-ppc7400-for-OSX-10.5.patch	2015-11-03 08:03:29 UTC (rev 142075)
+++ trunk/dports/lang/llvm-3.8/files/1006-Default-to-ppc7400-for-OSX-10.5.patch	2015-11-03 08:07:07 UTC (rev 142076)
@@ -1,26 +0,0 @@
-From c9f16640e01026c70d6e7e9ea94870ee67114d42 Mon Sep 17 00:00:00 2001
-From: Iain Sandoe <iain at codesourcery.com>
-Date: Sun, 27 Jul 2014 20:35:16 +0100
-Subject: [PATCH 1006/1008] Default to ppc7400 for OSX 10.5+
-
----
- lib/Driver/Tools.cpp | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git llvm_master/tools/clang/lib/Driver/Tools.cpp macports_master/tools/clang/lib/Driver/Tools.cpp
-index ba5dad5..6511dd3 100644
---- llvm_master/tools/clang/lib/Driver/Tools.cpp
-+++ macports_master/tools/clang/lib/Driver/Tools.cpp
-@@ -1588,6 +1588,9 @@ static std::string getCPUName(const ArgList &Args, const llvm::Triple &T,
-         TargetCPUName = "ppc64";
-       else if (T.getArch() == llvm::Triple::ppc64le)
-         TargetCPUName = "ppc64le";
-+      else if (T.isOSDarwin() && !T.isMacOSXVersionLT(10,5))
-+        // For 10.5+ Altivec is assumed available.
-+        TargetCPUName = "7400";
-       else
-         TargetCPUName = "ppc";
-     }
--- 
-2.5.0
-

Added: trunk/dports/lang/llvm-3.8/files/1006-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch
===================================================================
--- trunk/dports/lang/llvm-3.8/files/1006-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch	                        (rev 0)
+++ trunk/dports/lang/llvm-3.8/files/1006-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch	2015-11-03 08:07:07 UTC (rev 142076)
@@ -0,0 +1,29 @@
+From 21e7142c81b7a131e456637a78442f2f22b9d766 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Sat, 17 Jan 2015 19:08:57 -0800
+Subject: [PATCH 1006/1007] Only call setpriority(PRIO_DARWIN_THREAD, 0,
+ PRIO_DARWIN_BG) if it is available
+
+Tiger and earlier versions of darwin do not support this.
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ tools/libclang/CIndex.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git llvm_master/tools/clang/tools/libclang/CIndex.cpp macports_master/tools/clang/tools/libclang/CIndex.cpp
+index be53b82..a697342 100644
+--- llvm_master/tools/clang/tools/libclang/CIndex.cpp
++++ macports_master/tools/clang/tools/libclang/CIndex.cpp
+@@ -7207,7 +7207,7 @@ void clang::setThreadBackgroundPriority() {
+   if (getenv("LIBCLANG_BGPRIO_DISABLE"))
+     return;
+ 
+-#ifdef USE_DARWIN_THREADS
++#if defined(USE_DARWIN_THREADS) && defined(PRIO_DARWIN_THREAD) && defined(PRIO_DARWIN_BG)
+   setpriority(PRIO_DARWIN_THREAD, 0, PRIO_DARWIN_BG);
+ #endif
+ }
+-- 
+2.6.2
+

Added: trunk/dports/lang/llvm-3.8/files/1007-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch
===================================================================
--- trunk/dports/lang/llvm-3.8/files/1007-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch	                        (rev 0)
+++ trunk/dports/lang/llvm-3.8/files/1007-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch	2015-11-03 08:07:07 UTC (rev 142076)
@@ -0,0 +1,31 @@
+From 214d8b5ca74db21030bfb3a2b280d3ca7f57e068 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Tue, 20 Jan 2015 00:09:16 -0800
+Subject: [PATCH 1007/1007] Default to fragile ObjC runtime when targeting
+ darwin/ppc
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ lib/Driver/ToolChains.h | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git llvm_master/tools/clang/lib/Driver/ToolChains.h macports_master/tools/clang/lib/Driver/ToolChains.h
+index 7743378..970efdb 100644
+--- llvm_master/tools/clang/lib/Driver/ToolChains.h
++++ macports_master/tools/clang/lib/Driver/ToolChains.h
+@@ -317,8 +317,10 @@ public:
+   bool IsEncodeExtendedBlockSignatureDefault() const override { return true; }
+ 
+   bool IsObjCNonFragileABIDefault() const override {
+-    // Non-fragile ABI is default for everything but i386.
+-    return getTriple().getArch() != llvm::Triple::x86;
++    // Non-fragile ABI is default for legacy architectures
++    return getTriple().getArch() != llvm::Triple::x86 &&
++           getTriple().getArch() != llvm::Triple::ppc &&
++           getTriple().getArch() != llvm::Triple::ppc64;
+   }
+ 
+   bool UseObjCMixedDispatch() const override { return true; }
+-- 
+2.6.2
+

Deleted: trunk/dports/lang/llvm-3.8/files/1007-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch
===================================================================
--- trunk/dports/lang/llvm-3.8/files/1007-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch	2015-11-03 08:03:29 UTC (rev 142075)
+++ trunk/dports/lang/llvm-3.8/files/1007-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch	2015-11-03 08:07:07 UTC (rev 142076)
@@ -1,29 +0,0 @@
-From 405cb23bd85e7f01f581ebfed803d8201aab76d4 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
-Date: Sat, 17 Jan 2015 19:08:57 -0800
-Subject: [PATCH 1007/1008] Only call setpriority(PRIO_DARWIN_THREAD, 0,
- PRIO_DARWIN_BG) if it is available
-
-Tiger and earlier versions of darwin do not support this.
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
----
- tools/libclang/CIndex.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git llvm_master/tools/clang/tools/libclang/CIndex.cpp macports_master/tools/clang/tools/libclang/CIndex.cpp
-index 0334e72..b7e94d5 100644
---- llvm_master/tools/clang/tools/libclang/CIndex.cpp
-+++ macports_master/tools/clang/tools/libclang/CIndex.cpp
-@@ -7168,7 +7168,7 @@ void clang::setThreadBackgroundPriority() {
-   if (getenv("LIBCLANG_BGPRIO_DISABLE"))
-     return;
- 
--#ifdef USE_DARWIN_THREADS
-+#if defined(USE_DARWIN_THREADS) && defined(PRIO_DARWIN_THREAD) && defined(PRIO_DARWIN_BG)
-   setpriority(PRIO_DARWIN_THREAD, 0, PRIO_DARWIN_BG);
- #endif
- }
--- 
-2.5.0
-

Deleted: trunk/dports/lang/llvm-3.8/files/1008-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch
===================================================================
--- trunk/dports/lang/llvm-3.8/files/1008-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch	2015-11-03 08:03:29 UTC (rev 142075)
+++ trunk/dports/lang/llvm-3.8/files/1008-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch	2015-11-03 08:07:07 UTC (rev 142076)
@@ -1,31 +0,0 @@
-From 8405ca9968d91aaf7dd0c9cd3a16558cdb66577d Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
-Date: Tue, 20 Jan 2015 00:09:16 -0800
-Subject: [PATCH 1008/1008] Default to fragile ObjC runtime when targeting
- darwin/ppc
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
----
- lib/Driver/ToolChains.h | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git llvm_master/tools/clang/lib/Driver/ToolChains.h macports_master/tools/clang/lib/Driver/ToolChains.h
-index fd941e1..05f9e93 100644
---- llvm_master/tools/clang/lib/Driver/ToolChains.h
-+++ macports_master/tools/clang/lib/Driver/ToolChains.h
-@@ -271,8 +271,10 @@ public:
-   bool IsEncodeExtendedBlockSignatureDefault() const override { return true; }
- 
-   bool IsObjCNonFragileABIDefault() const override {
--    // Non-fragile ABI is default for everything but i386.
--    return getTriple().getArch() != llvm::Triple::x86;
-+    // Non-fragile ABI is default for legacy architectures
-+    return getTriple().getArch() != llvm::Triple::x86 &&
-+           getTriple().getArch() != llvm::Triple::ppc &&
-+           getTriple().getArch() != llvm::Triple::ppc64;
-   }
- 
-   bool UseObjCMixedDispatch() const override { return true; }
--- 
-2.5.0
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/8fa349db/attachment-0001.html>


More information about the macports-changes mailing list