[142075] trunk/dports/lang/llvm-3.7
jeremyhu at macports.org
jeremyhu at macports.org
Sat Dec 12 04:13:30 PST 2015
Revision: 142075
https://trac.macports.org/changeset/142075
Author: jeremyhu at macports.org
Date: 2015-11-03 00:03:29 -0800 (Tue, 03 Nov 2015)
Log Message:
-----------
llvm-3.7: Remove double install_name_tool-ing
Modified Paths:
--------------
trunk/dports/lang/llvm-3.7/Portfile
trunk/dports/lang/llvm-3.7/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch
trunk/dports/lang/llvm-3.7/files/1002-MacPorts-Only-Fall-back-on-xcodebuild-sdk-when-xcrun.patch
trunk/dports/lang/llvm-3.7/files/1003-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch
Added Paths:
-----------
trunk/dports/lang/llvm-3.7/files/1004-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch
trunk/dports/lang/llvm-3.7/files/1005-Default-to-ppc7400-for-OSX-10.5.patch
trunk/dports/lang/llvm-3.7/files/1006-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch
trunk/dports/lang/llvm-3.7/files/1007-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch
Removed Paths:
-------------
trunk/dports/lang/llvm-3.7/files/1004-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch
trunk/dports/lang/llvm-3.7/files/1005-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch
trunk/dports/lang/llvm-3.7/files/1006-Default-to-ppc7400-for-OSX-10.5.patch
trunk/dports/lang/llvm-3.7/files/1007-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch
trunk/dports/lang/llvm-3.7/files/1008-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch
Modified: trunk/dports/lang/llvm-3.7/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.7/Portfile 2015-11-03 07:41:54 UTC (rev 142074)
+++ trunk/dports/lang/llvm-3.7/Portfile 2015-11-03 08:03:29 UTC (rev 142075)
@@ -128,11 +128,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 \
@@ -429,12 +428,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.7/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch 2015-11-03 07:41:54 UTC (rev 142074)
+++ trunk/dports/lang/llvm-3.7/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch 2015-11-03 08:03:29 UTC (rev 142075)
@@ -1,7 +1,7 @@
-From 6fdbdc072ecd1eac579af61e5985cb935d02a52b Mon Sep 17 00:00:00 2001
+From 034ac61d5081c0dce0b42f2e69d09c3ae12f0de8 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>
@@ -13,10 +13,10 @@
tools/clang-format/clang-format.py | 2 +-
5 files changed, 5 insertions(+), 6 deletions(-)
-diff --git llvm_master/tools/clang/tools/clang-format/clang-format-bbedit.applescript macports_master/tools/clang/tools/clang-format/clang-format-bbedit.applescript
+diff --git llvm_release_37/tools/clang/tools/clang-format/clang-format-bbedit.applescript macports_release_37/tools/clang/tools/clang-format/clang-format-bbedit.applescript
index fa88fe9..eb09448 100644
---- llvm_master/tools/clang/tools/clang-format/clang-format-bbedit.applescript
-+++ macports_master/tools/clang/tools/clang-format/clang-format-bbedit.applescript
+--- llvm_release_37/tools/clang/tools/clang-format/clang-format-bbedit.applescript
++++ macports_release_37/tools/clang/tools/clang-format/clang-format-bbedit.applescript
@@ -15,7 +15,7 @@ tell application "BBEdit"
end tell
@@ -26,10 +26,10 @@
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 23adb07..063c5d2 100755
---- llvm_master/tools/clang/tools/clang-format/clang-format-diff.py
-+++ macports_master/tools/clang/tools/clang-format/clang-format-diff.py
+diff --git llvm_release_37/tools/clang/tools/clang-format/clang-format-diff.py macports_release_37/tools/clang/tools/clang-format/clang-format-diff.py
+index 64efb83..4371e38 100755
+--- llvm_release_37/tools/clang/tools/clang-format/clang-format-diff.py
++++ macports_release_37/tools/clang/tools/clang-format/clang-format-diff.py
@@ -32,7 +32,7 @@ import sys
@@ -39,10 +39,10 @@
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
+diff --git llvm_release_37/tools/clang/tools/clang-format/clang-format-sublime.py macports_release_37/tools/clang/tools/clang-format/clang-format-sublime.py
index 16ff56e..4b68104 100644
---- llvm_master/tools/clang/tools/clang-format/clang-format-sublime.py
-+++ macports_master/tools/clang/tools/clang-format/clang-format-sublime.py
+--- llvm_release_37/tools/clang/tools/clang-format/clang-format-sublime.py
++++ macports_release_37/tools/clang/tools/clang-format/clang-format-sublime.py
@@ -18,7 +18,7 @@ import sublime_plugin
import subprocess
@@ -52,10 +52,10 @@
# 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 ab0991b..a2a278a 100644
---- llvm_master/tools/clang/tools/clang-format/clang-format.el
-+++ macports_master/tools/clang/tools/clang-format/clang-format.el
+diff --git llvm_release_37/tools/clang/tools/clang-format/clang-format.el macports_release_37/tools/clang/tools/clang-format/clang-format.el
+index ca46144..1c49835 100644
+--- llvm_release_37/tools/clang/tools/clang-format/clang-format.el
++++ macports_release_37/tools/clang/tools/clang-format/clang-format.el
@@ -36,8 +36,7 @@
:group 'tools)
@@ -66,11 +66,11 @@
"Location of the clang-format executable.
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 a79205a..e71362a 100644
---- llvm_master/tools/clang/tools/clang-format/clang-format.py
-+++ macports_master/tools/clang/tools/clang-format/clang-format.py
-@@ -25,7 +25,7 @@ import vim
+diff --git llvm_release_37/tools/clang/tools/clang-format/clang-format.py macports_release_37/tools/clang/tools/clang-format/clang-format.py
+index 5cb41fc..e8a5904 100644
+--- llvm_release_37/tools/clang/tools/clang-format/clang-format.py
++++ macports_release_37/tools/clang/tools/clang-format/clang-format.py
+@@ -34,7 +34,7 @@ import vim
# set g:clang_format_path to the path to clang-format if it is not on the path
# Change this to the full path if clang-format is not on the path.
@@ -80,5 +80,5 @@
binary = vim.eval('g:clang_format_path')
--
-2.2.2
+2.6.2
Modified: trunk/dports/lang/llvm-3.7/files/1002-MacPorts-Only-Fall-back-on-xcodebuild-sdk-when-xcrun.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/1002-MacPorts-Only-Fall-back-on-xcodebuild-sdk-when-xcrun.patch 2015-11-03 07:41:54 UTC (rev 142074)
+++ trunk/dports/lang/llvm-3.7/files/1002-MacPorts-Only-Fall-back-on-xcodebuild-sdk-when-xcrun.patch 2015-11-03 08:03:29 UTC (rev 142075)
@@ -1,21 +1,22 @@
-From 3a51db8fffb0298c927fb8a183d47392027bbbc6 Mon Sep 17 00:00:00 2001
+From 1e29ab26da7f574ce29eeb949f5c46378968e0dd 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>
+(cherry picked from commit c69389a9ad48948076d754f99b94fbf797ea01fd)
---
runtime/compiler-rt/Makefile | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
-diff --git llvm_master/tools/clang/runtime/compiler-rt/Makefile macports_master/tools/clang/runtime/compiler-rt/Makefile
-index f06ef99..b0946ba 100644
---- llvm_master/tools/clang/runtime/compiler-rt/Makefile
-+++ macports_master/tools/clang/runtime/compiler-rt/Makefile
+diff --git llvm_release_37/tools/clang/runtime/compiler-rt/Makefile macports_release_37/tools/clang/runtime/compiler-rt/Makefile
+index 9976438..fc43e72 100644
+--- llvm_release_37/tools/clang/runtime/compiler-rt/Makefile
++++ macports_release_37/tools/clang/runtime/compiler-rt/Makefile
@@ -81,8 +81,18 @@ RuntimeLibrary.darwin.Configs := \
profile_osx.a \
- ubsan_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)
@@ -35,5 +36,5 @@
ifneq ($(IOS_SDK)$(IOSSIM_SDK),)
RuntimeLibrary.darwin.Configs += ios.a profile_ios.a
--
-2.2.2
+2.6.2
Modified: trunk/dports/lang/llvm-3.7/files/1003-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/1003-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch 2015-11-03 07:41:54 UTC (rev 142074)
+++ trunk/dports/lang/llvm-3.7/files/1003-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch 2015-11-03 08:03:29 UTC (rev 142075)
@@ -1,7 +1,7 @@
-From 95d6351d09e6ed8b288d0801ee9c8970477fdb57 Mon Sep 17 00:00:00 2001
+From 318d95a01c63460d78f224346f52d731f56d4671 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
@@ -11,11 +11,11 @@
tools/scan-build/scan-build | 2 ++
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 d52d8f5..2a3d1db 100755
---- llvm_master/tools/clang/tools/scan-build/scan-build
-+++ macports_master/tools/clang/tools/scan-build/scan-build
-@@ -1728,6 +1728,8 @@ if (defined $OutputFormat) {
+diff --git llvm_release_37/tools/clang/tools/scan-build/scan-build macports_release_37/tools/clang/tools/scan-build/scan-build
+index d7cadc3..9fd4e2a 100755
+--- llvm_release_37/tools/clang/tools/scan-build/scan-build
++++ macports_release_37/tools/clang/tools/scan-build/scan-build
+@@ -1711,6 +1711,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");
@@ -25,5 +25,5 @@
exec $ScanView, "$HtmlDir";
}
--
-2.2.2
+2.6.2
Deleted: trunk/dports/lang/llvm-3.7/files/1004-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/1004-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch 2015-11-03 07:41:54 UTC (rev 142074)
+++ trunk/dports/lang/llvm-3.7/files/1004-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch 2015-11-03 08:03:29 UTC (rev 142075)
@@ -1,27 +0,0 @@
-From 3459ae4f0909a6ab1fb5df79db042609b56a9231 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 b0946ba..5549038 100644
---- llvm_master/tools/clang/runtime/compiler-rt/Makefile
-+++ macports_master/tools/clang/runtime/compiler-rt/Makefile
-@@ -244,6 +244,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.2.2
-
Added: trunk/dports/lang/llvm-3.7/files/1004-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/1004-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch (rev 0)
+++ trunk/dports/lang/llvm-3.7/files/1004-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch 2015-11-03 08:03:29 UTC (rev 142075)
@@ -0,0 +1,74 @@
+From e84a39c6a5f2c80cc76b10deb5d5e46a900d823c 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_release_37/tools/clang/lib/Headers/Makefile macports_release_37/tools/clang/lib/Headers/Makefile
+index 903acac..7c37992 100644
+--- llvm_release_37/tools/clang/lib/Headers/Makefile
++++ macports_release_37/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_release_37/tools/clang/runtime/compiler-rt/Makefile macports_release_37/tools/clang/runtime/compiler-rt/Makefile
+index fc43e72..49a5b08 100644
+--- llvm_release_37/tools/clang/runtime/compiler-rt/Makefile
++++ macports_release_37/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
+@@ -257,9 +258,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.7/files/1005-Default-to-ppc7400-for-OSX-10.5.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/1005-Default-to-ppc7400-for-OSX-10.5.patch (rev 0)
+++ trunk/dports/lang/llvm-3.7/files/1005-Default-to-ppc7400-for-OSX-10.5.patch 2015-11-03 08:03:29 UTC (rev 142075)
@@ -0,0 +1,26 @@
+From a57f54ce05b13f4b1b1ff2323f7851354101dde0 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_release_37/tools/clang/lib/Driver/Tools.cpp macports_release_37/tools/clang/lib/Driver/Tools.cpp
+index 19ebbb9..1d46d50 100644
+--- llvm_release_37/tools/clang/lib/Driver/Tools.cpp
++++ macports_release_37/tools/clang/lib/Driver/Tools.cpp
+@@ -1601,6 +1601,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.7/files/1005-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/1005-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch 2015-11-03 07:41:54 UTC (rev 142074)
+++ trunk/dports/lang/llvm-3.7/files/1005-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch 2015-11-03 08:03:29 UTC (rev 142075)
@@ -1,74 +0,0 @@
-From 2984534bbb28860bef27168878a91cead3474cb3 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 5549038..50f0a81 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
-@@ -265,9 +266,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.2.2
-
Deleted: trunk/dports/lang/llvm-3.7/files/1006-Default-to-ppc7400-for-OSX-10.5.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/1006-Default-to-ppc7400-for-OSX-10.5.patch 2015-11-03 07:41:54 UTC (rev 142074)
+++ trunk/dports/lang/llvm-3.7/files/1006-Default-to-ppc7400-for-OSX-10.5.patch 2015-11-03 08:03:29 UTC (rev 142075)
@@ -1,26 +0,0 @@
-From 07ba2946e8edd7dd65126fa5108c14474a916f34 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 db43fde..46956e7 100644
---- llvm_master/tools/clang/lib/Driver/Tools.cpp
-+++ macports_master/tools/clang/lib/Driver/Tools.cpp
-@@ -1499,6 +1499,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.2.2
-
Added: trunk/dports/lang/llvm-3.7/files/1006-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/1006-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch (rev 0)
+++ trunk/dports/lang/llvm-3.7/files/1006-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch 2015-11-03 08:03:29 UTC (rev 142075)
@@ -0,0 +1,29 @@
+From bbf0a25518afce71036613356ca039b2960a942a 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_release_37/tools/clang/tools/libclang/CIndex.cpp macports_release_37/tools/clang/tools/libclang/CIndex.cpp
+index 8225a6c..c59a44f 100644
+--- llvm_release_37/tools/clang/tools/libclang/CIndex.cpp
++++ macports_release_37/tools/clang/tools/libclang/CIndex.cpp
+@@ -7203,7 +7203,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.7/files/1007-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/1007-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch (rev 0)
+++ trunk/dports/lang/llvm-3.7/files/1007-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch 2015-11-03 08:03:29 UTC (rev 142075)
@@ -0,0 +1,32 @@
+From d87ffa679c996f8782b8c6abb20a2064b60dc2c4 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>
+(cherry picked from commit 70016a68333b2175a1edbbcbad54918496ba391b)
+---
+ lib/Driver/ToolChains.h | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git llvm_release_37/tools/clang/lib/Driver/ToolChains.h macports_release_37/tools/clang/lib/Driver/ToolChains.h
+index 59eaade..03585e6 100644
+--- llvm_release_37/tools/clang/lib/Driver/ToolChains.h
++++ macports_release_37/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.6.2
+
Deleted: trunk/dports/lang/llvm-3.7/files/1007-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/1007-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch 2015-11-03 07:41:54 UTC (rev 142074)
+++ trunk/dports/lang/llvm-3.7/files/1007-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch 2015-11-03 08:03:29 UTC (rev 142075)
@@ -1,29 +0,0 @@
-From a98b6c303f44aa9f55c766aab1db65873a4e9c71 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 00ef8c0..6f124be 100644
---- llvm_master/tools/clang/tools/libclang/CIndex.cpp
-+++ macports_master/tools/clang/tools/libclang/CIndex.cpp
-@@ -7044,7 +7044,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.2.2
-
Deleted: trunk/dports/lang/llvm-3.7/files/1008-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/1008-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch 2015-11-03 07:41:54 UTC (rev 142074)
+++ trunk/dports/lang/llvm-3.7/files/1008-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch 2015-11-03 08:03:29 UTC (rev 142075)
@@ -1,31 +0,0 @@
-From 4f54947c85c0b54d17577d5387d0b01068bb4f80 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 47fb10d..80535f5 100644
---- llvm_master/tools/clang/lib/Driver/ToolChains.h
-+++ macports_master/tools/clang/lib/Driver/ToolChains.h
-@@ -273,8 +273,10 @@ public:
- }
-
- 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 {
---
-2.2.2
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/1e586ef3/attachment-0001.html>
More information about the macports-changes
mailing list