[131771] trunk/dports/lang/llvm-3.4
jeremyhu at macports.org
jeremyhu at macports.org
Sun Jan 18 00:03:57 PST 2015
Revision: 131771
https://trac.macports.org/changeset/131771
Author: jeremyhu at macports.org
Date: 2015-01-18 00:03:56 -0800 (Sun, 18 Jan 2015)
Log Message:
-----------
llvm-3.4: Cleanup patches
Modified Paths:
--------------
trunk/dports/lang/llvm-3.4/Portfile
Added Paths:
-----------
trunk/dports/lang/llvm-3.4/files/0001-MacPorts-Only-Update-install-targets-for-clang-subpo.patch
trunk/dports/lang/llvm-3.4/files/0002-MacPorts-Only-Skip-checking-for-python-in-configure.patch
trunk/dports/lang/llvm-3.4/files/0003-MacPorts-Only-Fix-sample-project-regex-to-work-with-.patch
trunk/dports/lang/llvm-3.4/files/0004-Set-the-Mach-O-CPU-Subtype-to-ppc7400-when-targeting.patch
trunk/dports/lang/llvm-3.4/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch
trunk/dports/lang/llvm-3.4/files/1002-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch
trunk/dports/lang/llvm-3.4/files/1003-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch
trunk/dports/lang/llvm-3.4/files/1004-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch
trunk/dports/lang/llvm-3.4/files/1005-Call-powerpc-darwin-external-tools-with-arch-ppc.patch
trunk/dports/lang/llvm-3.4/files/1006-Default-to-ppc7400-for-OSX-10.5.patch
trunk/dports/lang/llvm-3.4/files/1007-reinstate-fno-objc-legacy-dispatch-behavior-when-the.patch
trunk/dports/lang/llvm-3.4/files/1008-Change-__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__.patch
trunk/dports/lang/llvm-3.4/files/1009-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch
trunk/dports/lang/llvm-3.4/files/2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch
trunk/dports/lang/llvm-3.4/files/2002-On-darwin-build-ppc-slices-of-the-compiler-runtime-i.patch
trunk/dports/lang/llvm-3.4/files/3001-buildit-build-fix-for-Leopard.patch
trunk/dports/lang/llvm-3.4/files/3002-buildit-Set-compatibility-version-to-RC_ProjectSourc.patch
trunk/dports/lang/llvm-3.4/files/3003-Fix-local-and-iterator-when-building-with-Lion-and-n.patch
trunk/dports/lang/llvm-3.4/files/3004-Fix-missing-long-long-math-prototypes-when-using-the.patch
trunk/dports/lang/llvm-3.4/files/3005-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch
trunk/dports/lang/llvm-3.4/files/fix-clang-dylib-ids.patch
trunk/dports/lang/llvm-3.4/files/fix-dylib-ids.patch
trunk/dports/lang/llvm-3.4/files/leopard-no-blocks.patch
Removed Paths:
-------------
trunk/dports/lang/llvm-3.4/files/0001-Comment-out-SL-cctools-workaround.patch
trunk/dports/lang/llvm-3.4/files/0001-Fix-regular-expression-to-work-with-multiple-digit-v.patch
trunk/dports/lang/llvm-3.4/files/0001-Leopard-Default-to-fno-blocks.patch
trunk/dports/lang/llvm-3.4/files/0001-reinstate-fno-objc-legacy-dispatch-behavior-when-the.patch
trunk/dports/lang/llvm-3.4/files/clang-format.patch
trunk/dports/lang/llvm-3.4/files/clang-modernize.patch
trunk/dports/lang/llvm-3.4/files/fix-clang-dylib-ids.patch
trunk/dports/lang/llvm-3.4/files/fix-dylib-ids.patch
trunk/dports/lang/llvm-3.4/files/install_target.patch
trunk/dports/lang/llvm-3.4/files/move-clang-resources.patch
trunk/dports/lang/llvm-3.4/files/scan-build-PR-35006.patch
trunk/dports/lang/llvm-3.4/files/skip-python-check.patch
trunk/dports/lang/llvm-3.4/files/snowleopard-cmath.patch
trunk/dports/lang/llvm-3.4/files/tiger-libclang.patch
trunk/dports/lang/llvm-3.4/files/yosemite-deployment-target.patch
Modified: trunk/dports/lang/llvm-3.4/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.4/Portfile 2015-01-18 07:55:28 UTC (rev 131770)
+++ trunk/dports/lang/llvm-3.4/Portfile 2015-01-18 08:03:56 UTC (rev 131771)
@@ -8,7 +8,7 @@
set llvm_version_no_dot 34
name llvm-${llvm_version}
revision 1
-subport clang-${llvm_version} { revision 4 }
+subport clang-${llvm_version} { revision 5 }
set suffix mp-${llvm_version}
set sub_prefix ${prefix}/libexec/llvm-${llvm_version}
dist_subdir llvm
@@ -106,29 +106,36 @@
rmd160 8af0af0ead94bd50b1e6cbdcde5c4770bba5de0d \
sha256 ba85187551ae97fe1c8ab569903beae5ff0900e21233e5eb5389f6ceab1028b4
-patchfiles install_target.patch \
- 0001-Fix-regular-expression-to-work-with-multiple-digit-v.patch \
- fix-dylib-ids.patch
-
patch.pre_args -p1
+patchfiles \
+ 0001-MacPorts-Only-Update-install-targets-for-clang-subpo.patch \
+ 0002-MacPorts-Only-Skip-checking-for-python-in-configure.patch \
+ 0003-MacPorts-Only-Fix-sample-project-regex-to-work-with-.patch \
+ 0004-Set-the-Mach-O-CPU-Subtype-to-ppc7400-when-targeting.patch \
+ fix-dylib-ids.patch
-if {${subport} eq "llvm-${llvm_version}"} {
- # Prevent configure from failing if an acceptable Python is not
- # found (#32575, #42051, #46321). Python is only used for testing,
- # and we don't run or install the tests.
- patchfiles-append skip-python-check.patch
-} elseif {${subport} eq "clang-${llvm_version}"} {
- patchfiles-append move-clang-resources.patch \
- fix-clang-dylib-ids.patch \
- tiger-libclang.patch \
- scan-build-PR-35006.patch \
- 0001-Comment-out-SL-cctools-workaround.patch \
- 0001-reinstate-fno-objc-legacy-dispatch-behavior-when-the.patch \
- clang-format.patch \
- clang-modernize.patch \
- yosemite-deployment-target.patch \
- snowleopard-cmath.patch
+if {${subport} eq "clang-${llvm_version}"} {
+ patchfiles-append \
+ 1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch \
+ 1002-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch \
+ 1003-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch \
+ 1004-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch \
+ 1006-Default-to-ppc7400-for-OSX-10.5.patch \
+ 1007-reinstate-fno-objc-legacy-dispatch-behavior-when-the.patch \
+ 1008-Change-__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__.patch \
+ 1009-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch \
+ 2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch \
+ 2002-On-darwin-build-ppc-slices-of-the-compiler-runtime-i.patch \
+ 3001-buildit-build-fix-for-Leopard.patch \
+ 3002-buildit-Set-compatibility-version-to-RC_ProjectSourc.patch \
+ 3003-Fix-local-and-iterator-when-building-with-Lion-and-n.patch \
+ 3004-Fix-missing-long-long-math-prototypes-when-using-the.patch \
+ 3005-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch \
+ fix-clang-dylib-ids.patch
+# Introduces a failure during build (-arch ?? passed to ld), to be investigated:
+# 1005-Call-powerpc-darwin-external-tools-with-arch-ppc.patch \
+
build.target clang-only
destroot.target install-clang
}
@@ -199,7 +206,7 @@
}
if {${subport} eq "clang-${llvm_version}" && ${os.major} <= 9} {
- patchfiles-append leopard-no-asan.patch 0001-Leopard-Default-to-fno-blocks.patch
+ patchfiles-append leopard-no-asan.patch leopard-no-blocks.patch
}
# TODO: The llvm build system sets a 10.1 deployment target on Yosemite
Deleted: trunk/dports/lang/llvm-3.4/files/0001-Comment-out-SL-cctools-workaround.patch
===================================================================
--- trunk/dports/lang/llvm-3.4/files/0001-Comment-out-SL-cctools-workaround.patch 2015-01-18 07:55:28 UTC (rev 131770)
+++ trunk/dports/lang/llvm-3.4/files/0001-Comment-out-SL-cctools-workaround.patch 2015-01-18 08:03:56 UTC (rev 131771)
@@ -1,61 +0,0 @@
-Index: llvm-3.4.2.src/projects/compiler-rt/make/platform/clang_darwin.mk
-===================================================================
---- llvm-3.4.2.src.orig/projects/compiler-rt/make/platform/clang_darwin.mk
-+++ llvm-3.4.2.src/projects/compiler-rt/make/platform/clang_darwin.mk
-@@ -38,11 +38,11 @@ XCRunSdkPath = \
- ###
-
- CC := $(call XCRun,clang)
--AR := $(call XCRun,ar)
--RANLIB := $(call XCRun,ranlib)
--STRIP := $(call XCRun,strip)
--LIPO := $(call XCRun,lipo)
--DSYMUTIL := $(call XCRun,dsymutil)
-+AR := @@PREFIX@@/bin/ar
-+RANLIB := @@PREFIX@@/bin/ranlib
-+STRIP := @@PREFIX@@/bin/strip
-+LIPO := @@PREFIX@@/bin/lipo
-+DSYMUTIL := @@PREFIX@@/bin/dsymutil
-
- Configs :=
- UniversalArchs :=
-@@ -101,12 +101,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.
--ifneq ($(shell test -x /usr/bin/sw_vers && sw_vers -productVersion | grep 10.6),)
--UniversalArchs.ios := $(filter-out armv7, $(UniversalArchs.ios))
--UniversalArchs.cc_kext := $(filter-out armv7, $(UniversalArchs.cc_kext))
--UniversalArchs.cc_kext_ios5 := $(filter-out armv7, $(UniversalArchs.cc_kext_ios5))
--UniversalArchs.profile_ios := $(filter-out armv7, $(UniversalArchs.profile_ios))
--endif
-+#ifneq ($(shell test -x /usr/bin/sw_vers && sw_vers -productVersion | grep 10.6),)
-+#UniversalArchs.ios := $(filter-out armv7, $(UniversalArchs.ios))
-+#UniversalArchs.cc_kext := $(filter-out armv7, $(UniversalArchs.cc_kext))
-+#UniversalArchs.cc_kext_ios5 := $(filter-out armv7, $(UniversalArchs.cc_kext_ios5))
-+#UniversalArchs.profile_ios := $(filter-out armv7, $(UniversalArchs.profile_ios))
-+#endif
-
- # 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.
-Index: llvm-3.4.2.src/projects/compiler-rt/make/platform/clang_darwin_embedded.mk
-===================================================================
---- llvm-3.4.2.src.orig/projects/compiler-rt/make/platform/clang_darwin_embedded.mk
-+++ llvm-3.4.2.src/projects/compiler-rt/make/platform/clang_darwin_embedded.mk
-@@ -15,11 +15,11 @@ XCRun = \
- ###
-
- CC := $(call XCRun,clang)
--AR := $(call XCRun,ar)
--RANLIB := $(call XCRun,ranlib)
--STRIP := $(call XCRun,strip)
--LIPO := $(call XCRun,lipo)
--DSYMUTIL := $(call XCRun,dsymutil)
-+AR := @@PREFIX@@/bin/ar
-+RANLIB := @@PREFIX@@/bin/ranlib
-+STRIP := @@PREFIX@@/bin/strip
-+LIPO := @@PREFIX@@/bin/lipo
-+DSYMUTIL := @@PREFIX@@/bin/dsymutil
-
- Configs :=
- UniversalArchs :=
Deleted: trunk/dports/lang/llvm-3.4/files/0001-Fix-regular-expression-to-work-with-multiple-digit-v.patch
===================================================================
--- trunk/dports/lang/llvm-3.4/files/0001-Fix-regular-expression-to-work-with-multiple-digit-v.patch 2015-01-18 07:55:28 UTC (rev 131770)
+++ trunk/dports/lang/llvm-3.4/files/0001-Fix-regular-expression-to-work-with-multiple-digit-v.patch 2015-01-18 08:03:56 UTC (rev 131771)
@@ -1,15 +0,0 @@
---- a/projects/sample/Makefile.llvm.rules.orig 2013-08-04 15:06:11.000000000 -0700
-+++ b/projects/sample/Makefile.llvm.rules 2014-08-30 12:34:15.000000000 -0700
-@@ -476,9 +476,9 @@ endif
- ifeq ($(HOST_OS),Darwin)
- DARWIN_VERSION := `sw_vers -productVersion`
- # Strip a number like 10.4.7 to 10.4
-- DARWIN_VERSION := $(shell echo $(DARWIN_VERSION)| sed -E 's/(10.[0-9]).*/\1/')
-+ DARWIN_VERSION := $(shell echo $(DARWIN_VERSION)| sed -E 's/(10.[0-9]+).*/\1/')
- # Get "4" out of 10.4 for later pieces in the makefile.
-- DARWIN_MAJVERS := $(shell echo $(DARWIN_VERSION)| sed -E 's/10.([0-9]).*/\1/')
-+ DARWIN_MAJVERS := $(shell echo $(DARWIN_VERSION)| sed -E 's/10.([0-9]+).*/\1/')
-
- LoadableModuleOptions := -Wl,-flat_namespace -Wl,-undefined,suppress
- SharedLinkOptions := -dynamiclib
-
Deleted: trunk/dports/lang/llvm-3.4/files/0001-Leopard-Default-to-fno-blocks.patch
===================================================================
--- trunk/dports/lang/llvm-3.4/files/0001-Leopard-Default-to-fno-blocks.patch 2015-01-18 07:55:28 UTC (rev 131770)
+++ trunk/dports/lang/llvm-3.4/files/0001-Leopard-Default-to-fno-blocks.patch 2015-01-18 08:03:56 UTC (rev 131771)
@@ -1,26 +0,0 @@
-From 2500edffc9f1f44983927351eb60d4fe1cee4bcd Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
-Date: Wed, 7 Jan 2015 03:42:15 -0800
-Subject: [PATCH] Leopard: Default to -fno-blocks
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
----
- lib/Driver/ToolChains.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/Driver/ToolChains.h b/lib/Driver/ToolChains.h
-index 876bb01..27aa2ee 100644
---- a/tools/clang/lib/Driver/ToolChains.h
-+++ b/tools/clang/lib/Driver/ToolChains.h
-@@ -257,7 +257,7 @@ public:
- bool IsBlocksDefault() const override {
- // Always allow blocks on Apple; users interested in versioning are
- // expected to use /usr/include/Blocks.h.
-- return true;
-+ return false;
- }
- bool IsIntegratedAssemblerDefault() const override {
- // Default integrated assembler to on for Apple's MachO targets.
---
-2.2.1
-
Added: trunk/dports/lang/llvm-3.4/files/0001-MacPorts-Only-Update-install-targets-for-clang-subpo.patch
===================================================================
--- trunk/dports/lang/llvm-3.4/files/0001-MacPorts-Only-Update-install-targets-for-clang-subpo.patch (rev 0)
+++ trunk/dports/lang/llvm-3.4/files/0001-MacPorts-Only-Update-install-targets-for-clang-subpo.patch 2015-01-18 08:03:56 UTC (rev 131771)
@@ -0,0 +1,32 @@
+From 8462fd916cfd76a4871e67cac0527d67bd65b5f6 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Sat, 17 Jan 2015 16:33:09 -0800
+Subject: [PATCH 1/4] MacPorts Only: Update install targets for clang subport
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+(cherry picked from commit b514fa09a560de0b3241c6af0d134bae09a6aec3)
+---
+ Makefile | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git llvm_release_34/Makefile macports_release_34/Makefile
+index e3672b7..0b2bd3d 100644
+--- llvm_release_34/Makefile
++++ macports_release_34/Makefile
+@@ -70,9 +70,11 @@ ifeq ($(MAKECMDGOALS),install-clang)
+ DIRS := tools/clang/tools/driver tools/clang/lib/Headers \
+ tools/clang/tools/libclang \
+ tools/clang/tools/c-index-test \
+- tools/clang/include/clang-c \
+ tools/clang/runtime tools/clang/docs \
+- tools/lto
++ tools/clang/include tools/clang/lib \
++ tools/clang/tools/clang-format \
++ tools/clang/tools/extra/clang-modernize \
++ tools/clang/tools/extra/clang-apply-replacements
+ OPTIONAL_DIRS :=
+ NO_INSTALL = 1
+ endif
+--
+2.2.2
+
Deleted: trunk/dports/lang/llvm-3.4/files/0001-reinstate-fno-objc-legacy-dispatch-behavior-when-the.patch
===================================================================
--- trunk/dports/lang/llvm-3.4/files/0001-reinstate-fno-objc-legacy-dispatch-behavior-when-the.patch 2015-01-18 07:55:28 UTC (rev 131770)
+++ trunk/dports/lang/llvm-3.4/files/0001-reinstate-fno-objc-legacy-dispatch-behavior-when-the.patch 2015-01-18 08:03:56 UTC (rev 131771)
@@ -1,95 +0,0 @@
-From 32b4c5909f8aeed1d439b4d3ef1c92e7779c1cb6 Mon Sep 17 00:00:00 2001
-From: Fariborz Jahanian <fjahanian at apple.com>
-Date: Mon, 20 Jan 2014 19:32:33 +0000
-Subject: [PATCH] reinstate -fno-objc-legacy-dispatch behavior when the
- deployment target is 10.5 or earlier
-
-<rdar://problem/18971940>
-
-Squashes three cherry-picks from trunk into release_34 branch:
-
-ObjectiveC driver. reinstate -fno-objc-legacy-dispatch behavior
-when the deployment target is 10.5. // rdar://15852259
-
-git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@199682 91177308-0d34-0410-b5e6-96231b3b80d8
-(cherry picked from commit 015f92d36592bf95f6a71a24b64031479a990d35)
-
-ObjectiveC driver. change to reinstate -fno-objc-legacy-dispatch behavior
-when the deployment target is 10.5. // rdar://15852259
-
-git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@199780 91177308-0d34-0410-b5e6-96231b3b80d8
-(cherry picked from commit 69da841e85785ea625467e23804f6a9dd376528b)
-
-Objective-C driver. Do not use legacy dispatch for
-10.5 or less for x86_64 arch. // rdar://15852259
-
-git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@200854 91177308-0d34-0410-b5e6-96231b3b80d8
-(cherry picked from commit 3bb54680c4b6e7d918c82e96ecd56239e3149a5a)
----
- include/clang/Basic/ObjCRuntime.h | 5 +++++
- lib/Driver/Tools.cpp | 7 ++++---
- test/Driver/darwin-objc-defaults.m | 9 +++++++++
- 3 files changed, 18 insertions(+), 3 deletions(-)
-
-diff --git a/include/clang/Basic/ObjCRuntime.h b/include/clang/Basic/ObjCRuntime.h
-index 4c64497..fa375f4 100644
---- a/tools/clang/include/clang/Basic/ObjCRuntime.h
-+++ b/tools/clang/include/clang/Basic/ObjCRuntime.h
-@@ -99,6 +99,11 @@ public:
- Arch == llvm::Triple::x86_64)
- return false;
- }
-+ else if ((getKind() == MacOSX) && isNonFragile() &&
-+ (getVersion() >= VersionTuple(10, 0)) &&
-+ (getVersion() < VersionTuple(10, 6)))
-+ return Arch != llvm::Triple::x86_64;
-+ // Except for deployment target of 10.5 or less,
- // Mac runtimes use legacy dispatch everywhere now.
- return true;
- }
-diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp
-index b013eb5..2dc5735 100644
---- a/tools/clang/lib/Driver/Tools.cpp
-+++ b/tools/clang/lib/Driver/Tools.cpp
-@@ -3358,9 +3358,10 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
- ObjCRuntime objcRuntime = AddObjCRuntimeArgs(Args, CmdArgs, rewriteKind);
-
- // -fobjc-dispatch-method is only relevant with the nonfragile-abi, and
-- // legacy is the default. Next runtime is always legacy dispatch and
-- // -fno-objc-legacy-dispatch gets ignored silently.
-- if (objcRuntime.isNonFragile() && !objcRuntime.isNeXTFamily()) {
-+ // legacy is the default. Except for deployment taget of 10.5,
-+ // next runtime is always legacy dispatch and -fno-objc-legacy-dispatch
-+ // gets ignored silently.
-+ if (objcRuntime.isNonFragile()) {
- if (!Args.hasFlag(options::OPT_fobjc_legacy_dispatch,
- options::OPT_fno_objc_legacy_dispatch,
- objcRuntime.isLegacyDispatchDefaultForArch(
-diff --git a/test/Driver/darwin-objc-defaults.m b/test/Driver/darwin-objc-defaults.m
-index 1742deb..1b3f7a8 100644
---- a/tools/clang/test/Driver/darwin-objc-defaults.m
-+++ b/tools/clang/test/Driver/darwin-objc-defaults.m
-@@ -32,11 +32,20 @@
- // x86_64
-
- // RUN: %clang -target x86_64-apple-darwin10 -S -### %s \
-+// RUN: -arch x86_64 -mmacosx-version-min=10.4 2> %t
-+// RUN: FileCheck --check-prefix CHECK-CHECK-X86_64_OSX10_4 < %t %s
-+
-+// CHECK-CHECK-X86_64_OSX10_4: "-cc1"
-+// CHECK-CHECK-X86_64_OSX10_4: -fobjc-dispatch-method=non-legacy
-+
-+// RUN: %clang -target x86_64-apple-darwin10 -S -### %s \
- // RUN: -arch x86_64 -mmacosx-version-min=10.5 2> %t
- // RUN: FileCheck --check-prefix CHECK-CHECK-X86_64_OSX10_5 < %t %s
-
-+
- // CHECK-CHECK-X86_64_OSX10_5: "-cc1"
- // CHECK-CHECK-X86_64_OSX10_5: -fobjc-runtime=macosx-10.5
-+// CHECK-CHECK-X86_64_OSX10_5: -fobjc-dispatch-method=non-legacy
- // CHECK-CHECK-X86_64_OSX10_5: darwin-objc-defaults
-
- // RUN: %clang -target x86_64-apple-darwin10 -S -### %s \
---
-2.1.2
-
Added: trunk/dports/lang/llvm-3.4/files/0002-MacPorts-Only-Skip-checking-for-python-in-configure.patch
===================================================================
--- trunk/dports/lang/llvm-3.4/files/0002-MacPorts-Only-Skip-checking-for-python-in-configure.patch (rev 0)
+++ trunk/dports/lang/llvm-3.4/files/0002-MacPorts-Only-Skip-checking-for-python-in-configure.patch 2015-01-18 08:03:56 UTC (rev 131771)
@@ -0,0 +1,117 @@
+From dc6e6e5c54168582a1127126797ae34cd8668b5b Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Sat, 17 Jan 2015 16:43:00 -0800
+Subject: [PATCH 2/4] MacPorts Only: Skip checking for python in configure
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+(cherry picked from commit cf8cce2b5201c8113a73bb2c0c5e5f6a2d9085b8)
+
+Conflicts:
+ configure
+
+(cherry picked from commit c15b0db6296b9ba48e1796b46401c2431a8f5c0f)
+---
+ configure | 87 ---------------------------------------------------------------
+ 1 file changed, 87 deletions(-)
+
+diff --git llvm_release_34/configure macports_release_34/configure
+index 17b958c..0f533f0 100755
+--- llvm_release_34/configure
++++ macports_release_34/configure
+@@ -11769,93 +11769,6 @@ fi
+ echo "${ECHO_T}$NO_VARIADIC_MACROS $NO_MISSING_FIELD_INITIALIZERS $COVERED_SWITCH_DEFAULT $NO_UNINITIALIZED $NO_MAYBE_UNINITIALIZED" >&6; }
+
+
+-# Check whether --with-python was given.
+-if test "${with_python+set}" = set; then
+- withval=$with_python; PYTHON="$withval"
+-fi
+-
+-
+-if test -n "$PYTHON" && test -x "$PYTHON" ; then
+- { echo "$as_me:$LINENO: checking for python" >&5
+-echo $ECHO_N "checking for python... $ECHO_C" >&6; }
+- { echo "$as_me:$LINENO: result: user defined: $with_python" >&5
+-echo "${ECHO_T}user defined: $with_python" >&6; }
+-else
+- if test -n "$PYTHON" ; then
+- { echo "$as_me:$LINENO: WARNING: specified python ($PYTHON) is not usable, searching path" >&5
+-echo "$as_me: WARNING: specified python ($PYTHON) is not usable, searching path" >&2;}
+- fi
+-
+- # Extract the first word of "python python2 python26", so it can be a program name with args.
+-set dummy python python2 python26; ac_word=$2
+-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+-if test "${ac_cv_path_PYTHON+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- case $PYTHON in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path.
+- ;;
+- *)
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-IFS=$as_save_IFS
+-
+- test -z "$ac_cv_path_PYTHON" && ac_cv_path_PYTHON="{ echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6; }
+- { { echo "$as_me:$LINENO: error: could not find python 2.5 or higher" >&5
+-echo "$as_me: error: could not find python 2.5 or higher" >&2;}
+- { (exit 1); exit 1; }; }"
+- ;;
+-esac
+-fi
+-PYTHON=$ac_cv_path_PYTHON
+-if test -n "$PYTHON"; then
+- { echo "$as_me:$LINENO: result: $PYTHON" >&5
+-echo "${ECHO_T}$PYTHON" >&6; }
+-else
+- { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+-fi
+-
+-
+-fi
+-
+-{ echo "$as_me:$LINENO: checking for python >= 2.5" >&5
+-echo $ECHO_N "checking for python >= 2.5... $ECHO_C" >&6; }
+-ac_python_version=`$PYTHON -V 2>&1 | cut -d' ' -f2`
+-ac_python_version_major=`echo $ac_python_version | cut -d'.' -f1`
+-ac_python_version_minor=`echo $ac_python_version | cut -d'.' -f2`
+-ac_python_version_patch=`echo $ac_python_version | cut -d'.' -f3`
+-if test "$ac_python_version_major" -gt "2" || \
+- (test "$ac_python_version_major" -eq "2" && \
+- test "$ac_python_version_minor" -ge "5") ; then
+- { echo "$as_me:$LINENO: result: $PYTHON ($ac_python_version)" >&5
+-echo "${ECHO_T}$PYTHON ($ac_python_version)" >&6; }
+-else
+- { echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6; }
+- { { echo "$as_me:$LINENO: error: found python $ac_python_version ($PYTHON); required >= 2.5
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: found python $ac_python_version ($PYTHON); required >= 2.5
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }
+-fi
+-
+-
+-
+ { echo "$as_me:$LINENO: checking for sin in -lm" >&5
+ echo $ECHO_N "checking for sin in -lm... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_m_sin+set}" = set; then
+--
+2.2.2
+
Added: trunk/dports/lang/llvm-3.4/files/0003-MacPorts-Only-Fix-sample-project-regex-to-work-with-.patch
===================================================================
--- trunk/dports/lang/llvm-3.4/files/0003-MacPorts-Only-Fix-sample-project-regex-to-work-with-.patch (rev 0)
+++ trunk/dports/lang/llvm-3.4/files/0003-MacPorts-Only-Fix-sample-project-regex-to-work-with-.patch 2015-01-18 08:03:56 UTC (rev 131771)
@@ -0,0 +1,30 @@
+From f44378e03d9806b0b528b8589a4c705a9c564889 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Sat, 17 Jan 2015 18:52:14 -0800
+Subject: [PATCH 3/4] MacPorts Only: Fix sample project regex to work with
+ multiple digit versions
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ projects/sample/Makefile.llvm.rules | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git llvm_release_34/projects/sample/Makefile.llvm.rules macports_release_34/projects/sample/Makefile.llvm.rules
+index 545e629..10716db 100644
+--- llvm_release_34/projects/sample/Makefile.llvm.rules
++++ macports_release_34/projects/sample/Makefile.llvm.rules
+@@ -476,9 +476,9 @@ endif
+ ifeq ($(HOST_OS),Darwin)
+ DARWIN_VERSION := `sw_vers -productVersion`
+ # Strip a number like 10.4.7 to 10.4
+- DARWIN_VERSION := $(shell echo $(DARWIN_VERSION)| sed -E 's/(10.[0-9]).*/\1/')
++ DARWIN_VERSION := $(shell echo $(DARWIN_VERSION)| sed -E 's/(10.[0-9]+).*/\1/')
+ # Get "4" out of 10.4 for later pieces in the makefile.
+- DARWIN_MAJVERS := $(shell echo $(DARWIN_VERSION)| sed -E 's/10.([0-9]).*/\1/')
++ DARWIN_MAJVERS := $(shell echo $(DARWIN_VERSION)| sed -E 's/10.([0-9]+).*/\1/')
+
+ LoadableModuleOptions := -Wl,-flat_namespace -Wl,-undefined,suppress
+ SharedLinkOptions := -dynamiclib
+--
+2.2.2
+
Added: trunk/dports/lang/llvm-3.4/files/0004-Set-the-Mach-O-CPU-Subtype-to-ppc7400-when-targeting.patch
===================================================================
--- trunk/dports/lang/llvm-3.4/files/0004-Set-the-Mach-O-CPU-Subtype-to-ppc7400-when-targeting.patch (rev 0)
+++ trunk/dports/lang/llvm-3.4/files/0004-Set-the-Mach-O-CPU-Subtype-to-ppc7400-when-targeting.patch 2015-01-18 08:03:56 UTC (rev 131771)
@@ -0,0 +1,61 @@
+From 93300e85de8ff472bd8bfba2850ad9111eb0c080 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Sat, 17 Jan 2015 09:03:43 -0800
+Subject: [PATCH 4/4] Set the Mach-O CPU Subtype to ppc7400 when targeting
+ Leopard
+
+http://llvm.org/bugs/show_bug.cgi?id=18463
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+(cherry picked from commit 53f17b9930d8ace72f8a8f241bc54ce65e29ecd0)
+
+Conflicts:
+ lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp
+---
+ lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp | 14 +++++++++++---
+ 1 file changed, 11 insertions(+), 3 deletions(-)
+
+diff --git llvm_release_34/lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp macports_release_34/lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp
+index 0d42081..7260c10 100644
+--- llvm_release_34/lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp
++++ macports_release_34/lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp
+@@ -159,16 +159,23 @@ public:
+ // FIXME: This should be in a separate file.
+ namespace {
+ class DarwinPPCAsmBackend : public PPCAsmBackend {
++ Triple TheTriple;
+ public:
+- DarwinPPCAsmBackend(const Target &T) : PPCAsmBackend(T) { }
++ DarwinPPCAsmBackend(const Target &T, StringRef TT) : PPCAsmBackend(T), TheTriple(TT) { }
+
+ MCObjectWriter *createObjectWriter(raw_ostream &OS) const {
+ bool is64 = getPointerSize() == 8;
++ MachO::CPUSubTypePowerPC CS = MachO::CPU_SUBTYPE_POWERPC_ALL;
++
++ if (TheTriple.isOSDarwin() && !TheTriple.isMacOSXVersionLT(10,5)) {
++ CS = MachO::CPU_SUBTYPE_POWERPC_7400;
++ }
++
+ return createPPCMachObjectWriter(
+ OS,
+ /*Is64Bit=*/is64,
+ (is64 ? MachO::CPU_TYPE_POWERPC64 : MachO::CPU_TYPE_POWERPC),
+- MachO::CPU_SUBTYPE_POWERPC_ALL);
++ CS);
+ }
+
+ virtual bool doesSectionRequireSymbols(const MCSection &Section) const {
+@@ -198,8 +205,9 @@ namespace {
+ MCAsmBackend *llvm::createPPCAsmBackend(const Target &T,
+ const MCRegisterInfo &MRI,
+ StringRef TT, StringRef CPU) {
++
+ if (Triple(TT).isOSDarwin())
+- return new DarwinPPCAsmBackend(T);
++ return new DarwinPPCAsmBackend(T, TT);
+
+ uint8_t OSABI = MCELFObjectTargetWriter::getOSABI(Triple(TT).getOS());
+ return new ELFPPCAsmBackend(T, OSABI);
+--
+2.2.2
+
Added: trunk/dports/lang/llvm-3.4/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch
===================================================================
--- trunk/dports/lang/llvm-3.4/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch (rev 0)
+++ trunk/dports/lang/llvm-3.4/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch 2015-01-18 08:03:56 UTC (rev 131771)
@@ -0,0 +1,90 @@
+From 47d961284ee5012426d7ed9aa694c5092ec77d09 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/1009] MacPorts Only: Prepare clang-format for replacement
+ with absolute path
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+(cherry picked from commit d95bdf342037ee815fa21e871dd9479bc3572550)
+
+Conflicts:
+ tools/clang-format/clang-format.el
+ tools/clang-format/clang-format.py
+
+(cherry picked from commit be249dfc99009e07f65c01463ac62d9592aa00d7)
+---
+ tools/clang-format/clang-format-bbedit.applescript | 2 +-
+ tools/clang-format/clang-format-diff.py | 2 +-
+ tools/clang-format/clang-format-sublime.py | 2 +-
+ tools/clang-format/clang-format.el | 2 +-
+ tools/clang-format/clang-format.py | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git llvm_release_34/tools/clang/tools/clang-format/clang-format-bbedit.applescript macports_release_34/tools/clang/tools/clang-format/clang-format-bbedit.applescript
+index fa88fe9..eb09448 100644
+--- llvm_release_34/tools/clang/tools/clang-format/clang-format-bbedit.applescript
++++ macports_release_34/tools/clang/tools/clang-format/clang-format-bbedit.applescript
+@@ -15,7 +15,7 @@ tell application "BBEdit"
+ end tell
+
+ set filePath to urlToPOSIXPath(fileURL)
+-set newContents to do shell script "/path/to/clang-format -offset=" & selectionOffset & " -length=" & selectionLength & " " & quoted form of filePath
++set newContents to do shell script "@CLANG_FORMAT_PATH@ -offset=" & selectionOffset & " -length=" & selectionLength & " " & quoted form of filePath
+
+ tell application "BBEdit"
+ -- "set contents of text document 1 to newContents" scrolls to the bottom while
+diff --git llvm_release_34/tools/clang/tools/clang-format/clang-format-diff.py macports_release_34/tools/clang/tools/clang-format/clang-format-diff.py
+index 60b8fb7..0a70143 100755
+--- llvm_release_34/tools/clang/tools/clang-format/clang-format-diff.py
++++ macports_release_34/tools/clang/tools/clang-format/clang-format-diff.py
+@@ -31,7 +31,7 @@ import sys
+
+
+ # Change this to the full path if clang-format is not on the path.
+-binary = 'clang-format'
++binary = '@CLANG_FORMAT_PATH@'
+
+
+ def main():
+diff --git llvm_release_34/tools/clang/tools/clang-format/clang-format-sublime.py macports_release_34/tools/clang/tools/clang-format/clang-format-sublime.py
+index 16ff56e..4b68104 100644
+--- llvm_release_34/tools/clang/tools/clang-format/clang-format-sublime.py
++++ macports_release_34/tools/clang/tools/clang-format/clang-format-sublime.py
+@@ -18,7 +18,7 @@ import sublime_plugin
+ import subprocess
+
+ # Change this to the full path if clang-format is not on the path.
+-binary = 'clang-format'
++binary = '@CLANG_FORMAT_PATH@'
+
+ # 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_release_34/tools/clang/tools/clang-format/clang-format.el macports_release_34/tools/clang/tools/clang-format/clang-format.el
+index 520a3e2..f63731b 100644
+--- llvm_release_34/tools/clang/tools/clang-format/clang-format.el
++++ macports_release_34/tools/clang/tools/clang-format/clang-format.el
+@@ -13,7 +13,7 @@
+
+ ;; *Location of the clang-format binary. If it is on your PATH, a full path name
+ ;; need not be specified.
+-(defvar clang-format-binary "clang-format")
++(defvar clang-format-binary "@CLANG_FORMAT_PATH@")
+
+ (defun clang-format-region ()
+ "Use clang-format to format the currently active region."
+diff --git llvm_release_34/tools/clang/tools/clang-format/clang-format.py macports_release_34/tools/clang/tools/clang-format/clang-format.py
+index f5a5756..666ab46 100644
+--- llvm_release_34/tools/clang/tools/clang-format/clang-format.py
++++ macports_release_34/tools/clang/tools/clang-format/clang-format.py
+@@ -24,7 +24,7 @@ import sys
+ import vim
+
+ # Change this to the full path if clang-format is not on the path.
+-binary = 'clang-format'
++binary = '@CLANG_FORMAT_PATH@'
+
+ # 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
+--
+2.2.2
+
Added: trunk/dports/lang/llvm-3.4/files/1002-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch
===================================================================
--- trunk/dports/lang/llvm-3.4/files/1002-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch (rev 0)
+++ trunk/dports/lang/llvm-3.4/files/1002-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch 2015-01-18 08:03:56 UTC (rev 131771)
@@ -0,0 +1,30 @@
+From b63ecbd1b0a7b65e736bcd3be08cd6935ec2b49e 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 1002/1009] MacPorts Only: Fix name of scan-view executable
+ inside scan-build
+
+http://trac.macports.org/ticket/35006
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+(cherry picked from commit cf37a2cc4435f757228e928f5fbfb6cadd1b2e21)
+---
+ tools/scan-build/scan-build | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git llvm_release_34/tools/clang/tools/scan-build/scan-build macports_release_34/tools/clang/tools/scan-build/scan-build
+index 0f119f6..175d577 100755
+--- llvm_release_34/tools/clang/tools/scan-build/scan-build
++++ macports_release_34/tools/clang/tools/scan-build/scan-build
+@@ -1677,6 +1677,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");
++ 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";
+ }
+--
+2.2.2
+
Added: trunk/dports/lang/llvm-3.4/files/1003-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch
===================================================================
--- trunk/dports/lang/llvm-3.4/files/1003-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch (rev 0)
+++ trunk/dports/lang/llvm-3.4/files/1003-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch 2015-01-18 08:03:56 UTC (rev 131771)
@@ -0,0 +1,28 @@
+From cc0e2a7b162eea6f7918dd29cfbbcd96aaa59a09 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 1003/1009] MacPorts Only: Fix libclang_rt dylib ids
+
+We should probably not be shipping these.
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+(cherry picked from commit 1e79aa1d2d652fe79c244c185eeff76c2e40caf2)
+---
+ runtime/compiler-rt/Makefile | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git llvm_release_34/tools/clang/runtime/compiler-rt/Makefile macports_release_34/tools/clang/runtime/compiler-rt/Makefile
+index c6f38b2..273e482 100644
+--- llvm_release_34/tools/clang/runtime/compiler-rt/Makefile
++++ macports_release_34/tools/clang/runtime/compiler-rt/Makefile
+@@ -235,6 +235,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.4/files/1004-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch
===================================================================
--- trunk/dports/lang/llvm-3.4/files/1004-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch (rev 0)
+++ trunk/dports/lang/llvm-3.4/files/1004-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch 2015-01-18 08:03:56 UTC (rev 131771)
@@ -0,0 +1,75 @@
+From 6c249a820605f4e2f998d5849b5be1005bf480e3 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/1009] MacPorts Only: Relocate clang resources using llvm
+ version
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+(cherry picked from commit 0111fcf6f32dfeb41ae0b1e9be0258b899d97200)
+---
+ lib/Headers/Makefile | 3 ++-
+ runtime/compiler-rt/Makefile | 15 ++++++++++++++-
+ 2 files changed, 16 insertions(+), 2 deletions(-)
+
+diff --git llvm_release_34/tools/clang/lib/Headers/Makefile macports_release_34/tools/clang/lib/Headers/Makefile
+index 42219c4..69ca986 100644
+--- llvm_release_34/tools/clang/lib/Headers/Makefile
++++ macports_release_34/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.map: $(PROJ_SRC_DIR)/module.map $(HeaderDir)/.dir
+ # Hook into the standard Makefile rules.
+ all-local:: $(OBJHEADERS) $(HeaderDir)/module.map
+
+-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_34/tools/clang/runtime/compiler-rt/Makefile macports_release_34/tools/clang/runtime/compiler-rt/Makefile
+index 273e482..3ecee5c 100644
+--- llvm_release_34/tools/clang/runtime/compiler-rt/Makefile
++++ macports_release_34/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
+@@ -256,9 +257,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
+
Added: trunk/dports/lang/llvm-3.4/files/1005-Call-powerpc-darwin-external-tools-with-arch-ppc.patch
===================================================================
--- trunk/dports/lang/llvm-3.4/files/1005-Call-powerpc-darwin-external-tools-with-arch-ppc.patch (rev 0)
+++ trunk/dports/lang/llvm-3.4/files/1005-Call-powerpc-darwin-external-tools-with-arch-ppc.patch 2015-01-18 08:03:56 UTC (rev 131771)
@@ -0,0 +1,118 @@
+From e149c95a9e4135360256d4037c6a9718e6c03f97 Mon Sep 17 00:00:00 2001
+From: Rafael Espindola <rafael.espindola at gmail.com>
+Date: Thu, 28 Aug 2014 21:23:05 +0000
+Subject: [PATCH 1005/1009] Call powerpc-darwin external tools with -arch ppc.
+
+With this patch we call external tools for powerpc-darwin with "-arch ppc"
+instead of "-arch powerpc", so as to be compatible with the cctools assembler
+and ld64 linker.
+
+Patch by Stephen Drake!
+
+git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@216687 91177308-0d34-0410-b5e6-96231b3b80d8
+(cherry picked from commit 52fc295aad114ea91f4118d5e48fdfa142871704)
+---
+ lib/Driver/ToolChains.cpp | 2 +-
+ lib/Driver/Tools.cpp | 14 +++-----------
+ test/Driver/darwin-arch-default.c | 40 +++++++++++++++++++++++++++++++++++++--
+ 3 files changed, 42 insertions(+), 14 deletions(-)
+
+diff --git llvm_release_34/tools/clang/lib/Driver/ToolChains.cpp macports_release_34/tools/clang/lib/Driver/ToolChains.cpp
+index 4688335..6b2f698 100644
+--- llvm_release_34/tools/clang/lib/Driver/ToolChains.cpp
++++ macports_release_34/tools/clang/lib/Driver/ToolChains.cpp
+@@ -137,7 +137,7 @@ static const char *GetArmArchForMCpu(StringRef Value) {
+ StringRef Darwin::getDarwinArchName(const ArgList &Args) const {
+ switch (getTriple().getArch()) {
+ default:
+- return getArchName();
++ return getDefaultUniversalArchName();
+
+ case llvm::Triple::thumb:
+ case llvm::Triple::arm: {
+diff --git llvm_release_34/tools/clang/lib/Driver/Tools.cpp macports_release_34/tools/clang/lib/Driver/Tools.cpp
+index b013eb5..ca966c5 100644
+--- llvm_release_34/tools/clang/lib/Driver/Tools.cpp
++++ macports_release_34/tools/clang/lib/Driver/Tools.cpp
+@@ -4143,19 +4143,10 @@ void gcc::Common::ConstructJob(Compilation &C, const JobAction &JA,
+ RenderExtraToolArgs(JA, CmdArgs);
+
+ // If using a driver driver, force the arch.
+- llvm::Triple::ArchType Arch = getToolChain().getArch();
+ if (getToolChain().getTriple().isOSDarwin()) {
+ CmdArgs.push_back("-arch");
+-
+- // FIXME: Remove these special cases.
+- if (Arch == llvm::Triple::ppc)
+- CmdArgs.push_back("ppc");
+- else if (Arch == llvm::Triple::ppc64)
+- CmdArgs.push_back("ppc64");
+- else if (Arch == llvm::Triple::ppc64le)
+- CmdArgs.push_back("ppc64le");
+- else
+- CmdArgs.push_back(Args.MakeArgString(getToolChain().getArchName()));
++ CmdArgs.push_back(
++ Args.MakeArgString(getToolChain().getDefaultUniversalArchName()));
+ }
+
+ // Try to force gcc to match the tool chain we want, if we recognize
+@@ -4163,6 +4154,7 @@ void gcc::Common::ConstructJob(Compilation &C, const JobAction &JA,
+ //
+ // FIXME: The triple class should directly provide the information we want
+ // here.
++ llvm::Triple::ArchType Arch = getToolChain().getArch();
+ if (Arch == llvm::Triple::x86 || Arch == llvm::Triple::ppc)
+ CmdArgs.push_back("-m32");
+ else if (Arch == llvm::Triple::x86_64 || Arch == llvm::Triple::ppc64 ||
+diff --git llvm_release_34/tools/clang/test/Driver/darwin-arch-default.c macports_release_34/tools/clang/test/Driver/darwin-arch-default.c
+index 60bf61d..e7e5e89 100644
+--- llvm_release_34/tools/clang/test/Driver/darwin-arch-default.c
++++ macports_release_34/tools/clang/test/Driver/darwin-arch-default.c
+@@ -2,6 +2,42 @@
+ //
+ // RUN: %clang -target powerpc-apple-darwin8 -### \
+ // RUN: -ccc-print-phases %s 2> %t
+-// RUN: FileCheck --check-prefix=CHECK-POWERPC < %t %s
++// RUN: FileCheck --check-prefix=CHECK-BIND-PPC < %t %s
+ //
+-// CHECK-POWERPC: bind-arch, "ppc"
++// CHECK-BIND-PPC: bind-arch, "ppc"
++//
++// RUN: %clang -target powerpc64-apple-darwin8 -### \
++// RUN: -ccc-print-phases %s 2> %t
++// RUN: FileCheck --check-prefix=CHECK-BIND-PPC64 < %t %s
++//
++// CHECK-BIND-PPC64: bind-arch, "ppc64"
++
++// Check that the correct arch name is passed to the external assembler
++//
++// RUN: %clang -target powerpc-apple-darwin8 -### \
++// RUN: -no-integrated-as -c %s 2> %t
++// RUN: FileCheck --check-prefix=CHECK-AS-PPC < %t %s
++//
++// CHECK-AS-PPC: {{as(.exe)?"}}
++// CHECK-AS-PPC: "-arch" "ppc"
++//
++// RUN: %clang -target powerpc64-apple-darwin8 -### \
++// RUN: -no-integrated-as -c %s 2> %t
++// RUN: FileCheck --check-prefix=CHECK-AS-PPC64 < %t %s
++//
++// CHECK-AS-PPC64: {{as(.exe)?"}}
++// CHECK-AS-PPC64: "-arch" "ppc64"
++
++// Check that the correct arch name is passed to the external linker
++//
++// RUN: %clang -target powerpc-apple-darwin8 -### %s 2> %t
++// RUN: FileCheck --check-prefix=CHECK-LD-PPC < %t %s
++//
++// CHECK-LD-PPC: {{ld(.exe)?"}}
++// CHECK-LD-PPC: "-arch" "ppc"
++//
++// RUN: %clang -target powerpc64-apple-darwin8 -### %s 2> %t
++// RUN: FileCheck --check-prefix=CHECK-LD-PPC64 < %t %s
++//
++// CHECK-LD-PPC64: {{ld(.exe)?"}}
++// CHECK-LD-PPC64: "-arch" "ppc64"
+--
+2.2.2
+
Added: trunk/dports/lang/llvm-3.4/files/1006-Default-to-ppc7400-for-OSX-10.5.patch
===================================================================
--- trunk/dports/lang/llvm-3.4/files/1006-Default-to-ppc7400-for-OSX-10.5.patch (rev 0)
+++ trunk/dports/lang/llvm-3.4/files/1006-Default-to-ppc7400-for-OSX-10.5.patch 2015-01-18 08:03:56 UTC (rev 131771)
@@ -0,0 +1,27 @@
+From 0a8c33e1e541afd67d1e73dbb5c3dce7642ce9c2 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/1009] Default to ppc7400 for OSX 10.5+
+
+(cherry picked from commit 971aa68baad8c240f1abf30e62bd947a8923e3fa)
+---
+ lib/Driver/Tools.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git llvm_release_34/tools/clang/lib/Driver/Tools.cpp macports_release_34/tools/clang/lib/Driver/Tools.cpp
+index ca966c5..f8d1695 100644
+--- llvm_release_34/tools/clang/lib/Driver/Tools.cpp
++++ macports_release_34/tools/clang/lib/Driver/Tools.cpp
+@@ -1366,6 +1366,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.4/files/1007-reinstate-fno-objc-legacy-dispatch-behavior-when-the.patch
===================================================================
--- trunk/dports/lang/llvm-3.4/files/1007-reinstate-fno-objc-legacy-dispatch-behavior-when-the.patch (rev 0)
+++ trunk/dports/lang/llvm-3.4/files/1007-reinstate-fno-objc-legacy-dispatch-behavior-when-the.patch 2015-01-18 08:03:56 UTC (rev 131771)
@@ -0,0 +1,95 @@
+From f19c8901645037dcf8fb45a3d3ae25653a40df78 Mon Sep 17 00:00:00 2001
+From: Fariborz Jahanian <fjahanian at apple.com>
+Date: Mon, 20 Jan 2014 19:32:33 +0000
+Subject: [PATCH 1007/1009] reinstate -fno-objc-legacy-dispatch behavior when
+ the deployment target is 10.5 or earlier
+
+<rdar://problem/18971940>
+
+Squashes three cherry-picks from trunk into release_34 branch:
+
+ObjectiveC driver. reinstate -fno-objc-legacy-dispatch behavior
+when the deployment target is 10.5. // rdar://15852259
+
+git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@199682 91177308-0d34-0410-b5e6-96231b3b80d8
+(cherry picked from commit 015f92d36592bf95f6a71a24b64031479a990d35)
+
+ObjectiveC driver. change to reinstate -fno-objc-legacy-dispatch behavior
+when the deployment target is 10.5. // rdar://15852259
+
+git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@199780 91177308-0d34-0410-b5e6-96231b3b80d8
+(cherry picked from commit 69da841e85785ea625467e23804f6a9dd376528b)
+
+Objective-C driver. Do not use legacy dispatch for
+10.5 or less for x86_64 arch. // rdar://15852259
+
+git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@200854 91177308-0d34-0410-b5e6-96231b3b80d8
+(cherry picked from commit 3bb54680c4b6e7d918c82e96ecd56239e3149a5a)
+---
+ include/clang/Basic/ObjCRuntime.h | 5 +++++
+ lib/Driver/Tools.cpp | 7 ++++---
+ test/Driver/darwin-objc-defaults.m | 9 +++++++++
+ 3 files changed, 18 insertions(+), 3 deletions(-)
+
+diff --git llvm_release_34/tools/clang/include/clang/Basic/ObjCRuntime.h macports_release_34/tools/clang/include/clang/Basic/ObjCRuntime.h
+index 4c64497..fa375f4 100644
+--- llvm_release_34/tools/clang/include/clang/Basic/ObjCRuntime.h
++++ macports_release_34/tools/clang/include/clang/Basic/ObjCRuntime.h
+@@ -99,6 +99,11 @@ public:
+ Arch == llvm::Triple::x86_64)
+ return false;
+ }
++ else if ((getKind() == MacOSX) && isNonFragile() &&
++ (getVersion() >= VersionTuple(10, 0)) &&
++ (getVersion() < VersionTuple(10, 6)))
++ return Arch != llvm::Triple::x86_64;
++ // Except for deployment target of 10.5 or less,
+ // Mac runtimes use legacy dispatch everywhere now.
+ return true;
+ }
+diff --git llvm_release_34/tools/clang/lib/Driver/Tools.cpp macports_release_34/tools/clang/lib/Driver/Tools.cpp
+index f8d1695..09c5c9a 100644
+--- llvm_release_34/tools/clang/lib/Driver/Tools.cpp
++++ macports_release_34/tools/clang/lib/Driver/Tools.cpp
+@@ -3361,9 +3361,10 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
+ ObjCRuntime objcRuntime = AddObjCRuntimeArgs(Args, CmdArgs, rewriteKind);
+
+ // -fobjc-dispatch-method is only relevant with the nonfragile-abi, and
+- // legacy is the default. Next runtime is always legacy dispatch and
+- // -fno-objc-legacy-dispatch gets ignored silently.
+- if (objcRuntime.isNonFragile() && !objcRuntime.isNeXTFamily()) {
++ // legacy is the default. Except for deployment taget of 10.5,
++ // next runtime is always legacy dispatch and -fno-objc-legacy-dispatch
++ // gets ignored silently.
++ if (objcRuntime.isNonFragile()) {
+ if (!Args.hasFlag(options::OPT_fobjc_legacy_dispatch,
+ options::OPT_fno_objc_legacy_dispatch,
+ objcRuntime.isLegacyDispatchDefaultForArch(
+diff --git llvm_release_34/tools/clang/test/Driver/darwin-objc-defaults.m macports_release_34/tools/clang/test/Driver/darwin-objc-defaults.m
+index 1742deb..1b3f7a8 100644
+--- llvm_release_34/tools/clang/test/Driver/darwin-objc-defaults.m
++++ macports_release_34/tools/clang/test/Driver/darwin-objc-defaults.m
+@@ -32,11 +32,20 @@
+ // x86_64
+
+ // RUN: %clang -target x86_64-apple-darwin10 -S -### %s \
++// RUN: -arch x86_64 -mmacosx-version-min=10.4 2> %t
++// RUN: FileCheck --check-prefix CHECK-CHECK-X86_64_OSX10_4 < %t %s
++
++// CHECK-CHECK-X86_64_OSX10_4: "-cc1"
++// CHECK-CHECK-X86_64_OSX10_4: -fobjc-dispatch-method=non-legacy
++
++// RUN: %clang -target x86_64-apple-darwin10 -S -### %s \
+ // RUN: -arch x86_64 -mmacosx-version-min=10.5 2> %t
+ // RUN: FileCheck --check-prefix CHECK-CHECK-X86_64_OSX10_5 < %t %s
+
++
+ // CHECK-CHECK-X86_64_OSX10_5: "-cc1"
+ // CHECK-CHECK-X86_64_OSX10_5: -fobjc-runtime=macosx-10.5
++// CHECK-CHECK-X86_64_OSX10_5: -fobjc-dispatch-method=non-legacy
+ // CHECK-CHECK-X86_64_OSX10_5: darwin-objc-defaults
+
+ // RUN: %clang -target x86_64-apple-darwin10 -S -### %s \
+--
+2.2.2
+
Added: trunk/dports/lang/llvm-3.4/files/1008-Change-__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__.patch
===================================================================
--- trunk/dports/lang/llvm-3.4/files/1008-Change-__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__.patch (rev 0)
+++ trunk/dports/lang/llvm-3.4/files/1008-Change-__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__.patch 2015-01-18 08:03:56 UTC (rev 131771)
@@ -0,0 +1,67 @@
+From ab94d8e941daedf76ac64fdbd48f55e7f76f8fcd Mon Sep 17 00:00:00 2001
+From: Bob Wilson <bob.wilson at apple.com>
+Date: Fri, 8 Aug 2014 21:45:53 +0000
+Subject: [PATCH 1008/1009] Change
+ __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ for versions > 10.9.
+
+The previous encoding only allowed a single digit for the minor version
+number. This changes it to use 2 digits for both the minor version and the
+revision number.
+
+git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@215245 91177308-0d34-0410-b5e6-96231b3b80d8
+(cherry picked from commit ae784bea7abea9e97f0eab91dff85061ec76669a)
+
+Conflicts:
+ lib/Basic/Targets.cpp
+---
+ lib/Basic/Targets.cpp | 23 +++++++++++++++++------
+ test/Frontend/darwin-version.c | 2 ++
+ 2 files changed, 19 insertions(+), 6 deletions(-)
+
+diff --git llvm_release_34/tools/clang/lib/Basic/Targets.cpp macports_release_34/tools/clang/lib/Basic/Targets.cpp
+index c8bfda7..96821e2 100644
+--- llvm_release_34/tools/clang/lib/Basic/Targets.cpp
++++ macports_release_34/tools/clang/lib/Basic/Targets.cpp
+@@ -161,12 +161,23 @@ static void getDarwinDefines(MacroBuilder &Builder, const LangOptions &Opts,
+ // version.
+ assert(Triple.getEnvironmentName().empty() && "Invalid environment!");
+ assert(Maj < 100 && Min < 100 && Rev < 100 && "Invalid version!");
+- char Str[5];
+- Str[0] = '0' + (Maj / 10);
+- Str[1] = '0' + (Maj % 10);
+- Str[2] = '0' + std::min(Min, 9U);
+- Str[3] = '0' + std::min(Rev, 9U);
+- Str[4] = '\0';
++ char Str[7];
++ if (Maj < 10 || Maj == 10 && Min < 10) {
++ Str[0] = '0' + (Maj / 10);
++ Str[1] = '0' + (Maj % 10);
++ Str[2] = '0' + std::min(Min, 9U);
++ Str[3] = '0' + std::min(Rev, 9U);
++ Str[4] = '\0';
++ } else {
++ // Handle versions > 10.9.
++ Str[0] = '0' + (Maj / 10);
++ Str[1] = '0' + (Maj % 10);
++ Str[2] = '0' + (Min / 10);
++ Str[3] = '0' + (Min % 10);
++ Str[4] = '0' + (Rev / 10);
++ Str[5] = '0' + (Rev % 10);
++ Str[6] = '\0';
++ }
+ Builder.defineMacro("__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__", Str);
+ }
+ }
+diff --git llvm_release_34/tools/clang/test/Frontend/darwin-version.c macports_release_34/tools/clang/test/Frontend/darwin-version.c
+index 7234ab4..2e0804b 100644
+--- llvm_release_34/tools/clang/test/Frontend/darwin-version.c
++++ macports_release_34/tools/clang/test/Frontend/darwin-version.c
+@@ -23,3 +23,5 @@
+ // RUN: grep '__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__' %t | grep '1050' | count 1
+ // RUN: %clang -target i686-apple-darwin9 -mmacosx-version-min=10.6 -dM -E -o %t %s
+ // RUN: grep '__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__' %t | grep '1060' | count 1
++// RUN: %clang -target x86_64-apple-macosx -mmacosx-version-min=10.10 -dM -E -o %t %s
++// RUN: grep '__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__' %t | grep '101000' | count 1
+--
+2.2.2
+
Added: trunk/dports/lang/llvm-3.4/files/1009-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch
===================================================================
--- trunk/dports/lang/llvm-3.4/files/1009-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch (rev 0)
+++ trunk/dports/lang/llvm-3.4/files/1009-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch 2015-01-18 08:03:56 UTC (rev 131771)
@@ -0,0 +1,33 @@
+From a77967e715ba05ad0b295efeb4b81554a4f978e7 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 1009/1009] 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>
+(cherry picked from commit 92a47c4641be0c3fbc0e660f5680b3d4d524887f)
+
+Conflicts:
+ tools/libclang/CIndex.cpp
+---
+ tools/libclang/CIndex.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git llvm_release_34/tools/clang/tools/libclang/CIndex.cpp macports_release_34/tools/clang/tools/libclang/CIndex.cpp
+index f53e5c1..2189f09 100644
+--- llvm_release_34/tools/clang/tools/libclang/CIndex.cpp
++++ macports_release_34/tools/clang/tools/libclang/CIndex.cpp
+@@ -6518,7 +6518,7 @@ void clang::setThreadBackgroundPriority() {
+ return;
+
+ // FIXME: Move to llvm/Support and make it cross-platform.
+-#ifdef __APPLE__
++#if defined(__APPLE__) && defined(PRIO_DARWIN_THREAD) && defined(PRIO_DARWIN_BG)
+ setpriority(PRIO_DARWIN_THREAD, 0, PRIO_DARWIN_BG);
+ #endif
+ }
+--
+2.2.2
+
Added: trunk/dports/lang/llvm-3.4/files/2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch
===================================================================
--- trunk/dports/lang/llvm-3.4/files/2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch (rev 0)
+++ trunk/dports/lang/llvm-3.4/files/2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch 2015-01-18 08:03:56 UTC (rev 131771)
@@ -0,0 +1,37 @@
+From ed595282e6dc40bc1f3bc43fa3a109383930fae3 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Mon, 15 Apr 2013 22:38:18 -0700
+Subject: [PATCH 2001/2002] MacPorts Only: Comment out SL cctools workaround
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+(cherry picked from commit 2972ffafff4a394f521986b47810324cd1b7e3ba)
+---
+ make/platform/clang_darwin.mk | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git llvm_release_34/projects/compiler-rt/make/platform/clang_darwin.mk macports_release_34/projects/compiler-rt/make/platform/clang_darwin.mk
+index ddb7029..c13063c 100644
+--- llvm_release_34/projects/compiler-rt/make/platform/clang_darwin.mk
++++ macports_release_34/projects/compiler-rt/make/platform/clang_darwin.mk
+@@ -101,12 +101,12 @@ UniversalArchs.ubsan_osx := $(call CheckArches,i386 x86_64,ubsan_osx)
+ # 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.
+-ifneq ($(shell test -x /usr/bin/sw_vers && sw_vers -productVersion | grep 10.6),)
+-UniversalArchs.ios := $(filter-out armv7, $(UniversalArchs.ios))
+-UniversalArchs.cc_kext := $(filter-out armv7, $(UniversalArchs.cc_kext))
+-UniversalArchs.cc_kext_ios5 := $(filter-out armv7, $(UniversalArchs.cc_kext_ios5))
+-UniversalArchs.profile_ios := $(filter-out armv7, $(UniversalArchs.profile_ios))
+-endif
++#ifneq ($(shell test -x /usr/bin/sw_vers && sw_vers -productVersion | grep 10.6),)
++#UniversalArchs.ios := $(filter-out armv7, $(UniversalArchs.ios))
++#UniversalArchs.cc_kext := $(filter-out armv7, $(UniversalArchs.cc_kext))
++#UniversalArchs.cc_kext_ios5 := $(filter-out armv7, $(UniversalArchs.cc_kext_ios5))
++#UniversalArchs.profile_ios := $(filter-out armv7, $(UniversalArchs.profile_ios))
++#endif
+
+ # 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.
+--
+2.2.2
+
Added: trunk/dports/lang/llvm-3.4/files/2002-On-darwin-build-ppc-slices-of-the-compiler-runtime-i.patch
===================================================================
--- trunk/dports/lang/llvm-3.4/files/2002-On-darwin-build-ppc-slices-of-the-compiler-runtime-i.patch (rev 0)
+++ trunk/dports/lang/llvm-3.4/files/2002-On-darwin-build-ppc-slices-of-the-compiler-runtime-i.patch 2015-01-18 08:03:56 UTC (rev 131771)
@@ -0,0 +1,56 @@
+From a9fb1f78ad72fdc070f5c61b003e4a13d1c46c68 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Sat, 17 Jan 2015 19:55:19 -0800
+Subject: [PATCH 2002/2002] On darwin, build ppc slices of the compiler runtime
+ if requested and supported by the SDK and toolchain
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+(cherry picked from commit 1fe76a2b12f4837c49237cdca6803e5f43e00f7c)
+
+Conflicts:
+ make/platform/clang_darwin.mk
+---
+ make/platform/clang_darwin.mk | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git llvm_release_34/projects/compiler-rt/make/platform/clang_darwin.mk macports_release_34/projects/compiler-rt/make/platform/clang_darwin.mk
+index c13063c..5adebfe 100644
+--- llvm_release_34/projects/compiler-rt/make/platform/clang_darwin.mk
++++ macports_release_34/projects/compiler-rt/make/platform/clang_darwin.mk
+@@ -53,11 +53,11 @@ UniversalArchs :=
+ Configs += eprintf
+ UniversalArchs.eprintf := $(call CheckArches,i386,eprintf)
+
+-# Configuration for targetting 10.4. We need a few functions missing from
+-# libgcc_s.10.4.dylib. We only build x86 slices since clang doesn't really
+-# support targetting PowerPC.
++# Configuration for targeting 10.4. We need a few functions missing from
++# libgcc_s.10.4.dylib. We don't build ppc64 slices since clang doesn't really
++# support it..
+ Configs += 10.4
+-UniversalArchs.10.4 := $(call CheckArches,i386 x86_64,10.4)
++UniversalArchs.10.4 := $(call CheckArches,ppc i386 x86_64,10.4)
+
+ # Configuration for targetting iOS for a couple of functions that didn't
+ # make it into libSystem.
+@@ -67,7 +67,7 @@ UniversalArchs.ios := $(call CheckArches,i386 x86_64 armv7,ios)
+ # Configuration for targetting OSX. These functions may not be in libSystem
+ # so we should provide our own.
+ Configs += osx
+-UniversalArchs.osx := $(call CheckArches,i386 x86_64,osx)
++UniversalArchs.osx := $(call CheckArches,ppc i386 x86_64,osx)
+
+ # Configuration for use with kernel/kexts.
+ Configs += cc_kext
+@@ -80,7 +80,7 @@ UniversalArchs.cc_kext_ios5 := $(call CheckArches,x86_64 armv7,cc_kext_ios5)
+
+ # Configurations which define the profiling support functions.
+ Configs += profile_osx
+-UniversalArchs.profile_osx := $(call CheckArches,i386 x86_64,profile_osx)
++UniversalArchs.profile_osx := $(call CheckArches,ppc i386 x86_64,profile_osx)
+ Configs += profile_ios
+ UniversalArchs.profile_ios := $(call CheckArches,i386 x86_64 armv7,profile_ios)
+
+--
+2.2.2
+
Added: trunk/dports/lang/llvm-3.4/files/3001-buildit-build-fix-for-Leopard.patch
===================================================================
--- trunk/dports/lang/llvm-3.4/files/3001-buildit-build-fix-for-Leopard.patch (rev 0)
+++ trunk/dports/lang/llvm-3.4/files/3001-buildit-build-fix-for-Leopard.patch 2015-01-18 08:03:56 UTC (rev 131771)
@@ -0,0 +1,39 @@
+From 4bba273416f58aa35180e0d8f1b030ee1bc95623 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Fri, 16 Jan 2015 21:10:35 -0800
+Subject: [PATCH 3001/3005] buildit build fix for Leopard
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+(cherry picked from commit b46773a9b7d9867cbfc74d203cd9a444e323d1f7)
+
+Conflicts:
+ lib/buildit
+---
+ lib/buildit | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git llvm_release_34/projects/libcxx/lib/buildit macports_release_34/projects/libcxx/lib/buildit
+index af6b466..cdb7826 100755
+--- llvm_release_34/projects/libcxx/lib/buildit
++++ macports_release_34/projects/libcxx/lib/buildit
+@@ -45,7 +45,7 @@ case $TRIPLE in
+ RC_CFLAGS="-arch i386 -arch x86_64"
+ fi
+ SOEXT=dylib
+- if [ "$MACOSX_DEPLOYMENT_TARGET" == "10.6" ]
++ if [ "$MACOSX_DEPLOYMENT_TARGET" = "10.5" ] || [ "$MACOSX_DEPLOYMENT_TARGET" = "10.6" ]
+ then
+ EXTRA_FLAGS="-nostdinc++ -std=c++11 -U__STRICT_ANSI__"
+ LDSHARED_FLAGS="-o libc++.1.dylib \
+@@ -54,7 +54,7 @@ case $TRIPLE in
+ -install_name /usr/lib/libc++.1.dylib \
+ -Wl,-reexport_library,/usr/lib/libc++abi.dylib \
+ -Wl,-unexported_symbols_list,libc++unexp.exp \
+- /usr/lib/libSystem.B.dylib"
++ /usr/lib/libSystem.B.dylib /usr/lib/libgcc_s.1.dylib"
+ else
+ if [ -n "$SDKROOT" ]
+ then
+--
+2.2.2
+
Added: trunk/dports/lang/llvm-3.4/files/3002-buildit-Set-compatibility-version-to-RC_ProjectSourc.patch
===================================================================
--- trunk/dports/lang/llvm-3.4/files/3002-buildit-Set-compatibility-version-to-RC_ProjectSourc.patch (rev 0)
+++ trunk/dports/lang/llvm-3.4/files/3002-buildit-Set-compatibility-version-to-RC_ProjectSourc.patch 2015-01-18 08:03:56 UTC (rev 131771)
@@ -0,0 +1,29 @@
+From 55b09e4855bc4298ffce38ca6e81b2893cdaa93f Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Fri, 16 Jan 2015 21:11:37 -0800
+Subject: [PATCH 3002/3005] buildit: Set compatibility version to
+ RC_ProjectSourceVersion
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+(cherry picked from commit ce37e96b968fbcc4b6aef18b1a163d297db903b2)
+---
+ lib/buildit | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git llvm_release_34/projects/libcxx/lib/buildit macports_release_34/projects/libcxx/lib/buildit
+index cdb7826..1549974 100755
+--- llvm_release_34/projects/libcxx/lib/buildit
++++ macports_release_34/projects/libcxx/lib/buildit
+@@ -49,7 +49,8 @@ case $TRIPLE in
+ then
+ EXTRA_FLAGS="-nostdinc++ -std=c++11 -U__STRICT_ANSI__"
+ LDSHARED_FLAGS="-o libc++.1.dylib \
+- -dynamiclib -nodefaultlibs -current_version 1 \
++ -dynamiclib -nodefaultlibs \
++ -current_version ${RC_ProjectSourceVersion} \
+ -compatibility_version 1 \
+ -install_name /usr/lib/libc++.1.dylib \
+ -Wl,-reexport_library,/usr/lib/libc++abi.dylib \
+--
+2.2.2
+
Added: trunk/dports/lang/llvm-3.4/files/3003-Fix-local-and-iterator-when-building-with-Lion-and-n.patch
===================================================================
--- trunk/dports/lang/llvm-3.4/files/3003-Fix-local-and-iterator-when-building-with-Lion-and-n.patch (rev 0)
+++ trunk/dports/lang/llvm-3.4/files/3003-Fix-local-and-iterator-when-building-with-Lion-and-n.patch 2015-01-18 08:03:56 UTC (rev 131771)
@@ -0,0 +1,46 @@
+From 426dae3e16b9e74061c09552e166e8d34a7d2a2a Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Fri, 16 Jan 2015 21:34:36 -0800
+Subject: [PATCH 3003/3005] Fix <local> and <iterator> when building with Lion
+ and newer Availability.h
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+(cherry picked from commit cb271d6ce269bbddc916643c495ccbdfde6e3054)
+---
+ include/iterator | 4 ++--
+ include/locale | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git llvm_release_34/projects/libcxx/include/iterator macports_release_34/projects/libcxx/include/iterator
+index 70a664d..70766ae 100644
+--- llvm_release_34/projects/libcxx/include/iterator
++++ macports_release_34/projects/libcxx/include/iterator
+@@ -901,8 +901,8 @@ public:
+ _LIBCPP_INLINE_VISIBILITY bool failed() const _NOEXCEPT {return __sbuf_ == 0;}
+
+ #if !defined(__APPLE__) || \
+- (defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED > __MAC_10_8) || \
+- (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED > __IPHONE_6_0)
++ (defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && defined(__MAC_10_8) && __MAC_OS_X_VERSION_MIN_REQUIRED > __MAC_10_8) || \
++ (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && defined(__IPHONE_6_0) && __IPHONE_OS_VERSION_MIN_REQUIRED > __IPHONE_6_0)
+
+ template <class _Ch, class _Tr>
+ friend
+diff --git llvm_release_34/projects/libcxx/include/locale macports_release_34/projects/libcxx/include/locale
+index ac3ae7e..088739b 100644
+--- llvm_release_34/projects/libcxx/include/locale
++++ macports_release_34/projects/libcxx/include/locale
+@@ -1467,8 +1467,8 @@ __pad_and_output(_OutputIterator __s,
+ }
+
+ #if !defined(__APPLE__) || \
+- (defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED > __MAC_10_8) || \
+- (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED > __IPHONE_6_0)
++ (defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && defined(__MAC_10_8) && __MAC_OS_X_VERSION_MIN_REQUIRED > __MAC_10_8) || \
++ (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && defined(__IPHONE_6_0) && __IPHONE_OS_VERSION_MIN_REQUIRED > __IPHONE_6_0)
+
+ template <class _CharT, class _Traits>
+ _LIBCPP_HIDDEN
+--
+2.2.2
+
Added: trunk/dports/lang/llvm-3.4/files/3004-Fix-missing-long-long-math-prototypes-when-using-the.patch
===================================================================
--- trunk/dports/lang/llvm-3.4/files/3004-Fix-missing-long-long-math-prototypes-when-using-the.patch (rev 0)
+++ trunk/dports/lang/llvm-3.4/files/3004-Fix-missing-long-long-math-prototypes-when-using-the.patch 2015-01-18 08:03:56 UTC (rev 131771)
@@ -0,0 +1,42 @@
+From 238e35320218b0bc319a0bc10387e66360431721 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Sat, 17 Jan 2015 16:26:20 -0800
+Subject: [PATCH 3004/3005] Fix missing long long math prototypes when using
+ the Snow Leopard SDK
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+(cherry picked from commit afdc64a717d3b284f920944146952bcbbc111cd0)
+---
+ include/cmath | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+diff --git llvm_release_34/projects/libcxx/include/cmath macports_release_34/projects/libcxx/include/cmath
+index 75087ae..12da454 100644
+--- llvm_release_34/projects/libcxx/include/cmath
++++ macports_release_34/projects/libcxx/include/cmath
+@@ -301,6 +301,22 @@ long double truncl(long double x);
+ #include <math.h>
+ #include <type_traits>
+
++#ifdef __APPLE__
++#include <Availability.h>
++#if __MAC_OS_X_VERSION_MAX_ALLOWED < 1070
++/* These prototypes are incorrectly omitted from <math.h> on Snow Leopard despite being available */
++extern "C" {
++ extern long long int llrintl(long double);
++ extern long long int llrint(double);
++ extern long long int llrintf(float);
++
++ extern long long int llroundl(long double);
++ extern long long int llround(double);
++ extern long long int llroundf(float);
++}
++#endif
++#endif // __APPLE__
++
+ #ifdef _LIBCPP_MSVCRT
+ #include "support/win32/math_win32.h"
+ #endif
+--
+2.2.2
+
Added: trunk/dports/lang/llvm-3.4/files/3005-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch
===================================================================
--- trunk/dports/lang/llvm-3.4/files/3005-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch (rev 0)
+++ trunk/dports/lang/llvm-3.4/files/3005-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch 2015-01-18 08:03:56 UTC (rev 131771)
@@ -0,0 +1,322 @@
+From 082c9cc13aaceea214d800c486a638be33f14033 Mon Sep 17 00:00:00 2001
+From: David Fang <fang at csl.cornell.edu>
+Date: Wed, 15 Jan 2014 21:27:34 -0800
+Subject: [PATCH 3005/3005] implement atomic<> using mutex/lock_guard for 64b
+ ops on 32b PPC not pretty, not fast, but passes atomic tests
+
+(cherry picked from commit 88eccd6a4edd5675ab6657464c004a249893c974)
+
+Conflicts:
+ include/atomic
+
+(cherry picked from commit 89b579c10f9a95a39a0f7bf8560c505a0d2d0eee)
+---
+ include/__atomic_locked | 240 ++++++++++++++++++++++++++++++++++++++++++++++++
+ include/atomic | 46 ++++++++++
+ 2 files changed, 286 insertions(+)
+ create mode 100644 include/__atomic_locked
+
+diff --git llvm_release_34/projects/libcxx/include/__atomic_locked macports_release_34/projects/libcxx/include/__atomic_locked
+new file mode 100644
+index 0000000..f10dd74
+--- /dev/null
++++ macports_release_34/projects/libcxx/include/__atomic_locked
+@@ -0,0 +1,240 @@
++// -*- C++ -*-
++//===--------------------------- __atomic_locked --------------------------===//
++//
++// The LLVM Compiler Infrastructure
++//
++// This file is distributed under the University of Illinois Open Source
++// License. See LICENSE.TXT for details.
++//
++//===----------------------------------------------------------------------===//
++
++#ifndef _LIBCPP_ATOMIC_LOCKED
++#define _LIBCPP_ATOMIC_LOCKED
++
++#include <__mutex_base> // for mutex and lock_guard
++
++/**
++ This provides slow-but-usable lock-based atomic access to
++ structures for which atomic lock-free functions are missing.
++ This is motivated by the desire for 64b atomic operations
++ on 32b PowerPC architectures.
++**/
++
++#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
++#pragma GCC system_header
++#endif
++
++_LIBCPP_BEGIN_NAMESPACE_STD
++
++template <class _Tp, bool = is_integral<_Tp>::value && !is_same<_Tp, bool>::value>
++struct __atomic_mutex_locked // false
++{
++ mutable _Atomic(_Tp) __a_;
++ mutable mutex __lock_;
++ typedef lock_guard<mutex> lock_type;
++
++ _Tp& na(void) const { return reinterpret_cast<_Tp&>(__a_); }
++ volatile _Tp& na(void) const volatile { return reinterpret_cast<volatile _Tp&>(__a_); }
++
++ _LIBCPP_INLINE_VISIBILITY
++ bool is_lock_free() const volatile _NOEXCEPT
++ {return false;}
++ _LIBCPP_INLINE_VISIBILITY
++ bool is_lock_free() const _NOEXCEPT
++ {return false;}
++ _LIBCPP_INLINE_VISIBILITY
++ void store(_Tp __d, memory_order = memory_order_seq_cst) volatile _NOEXCEPT
++ { const lock_type g(const_cast<mutex&>(__lock_)); na() = __d; }
++ _LIBCPP_INLINE_VISIBILITY
++ void store(_Tp __d, memory_order = memory_order_seq_cst) _NOEXCEPT
++ { const lock_type g(__lock_); na() = __d; }
++ _LIBCPP_INLINE_VISIBILITY
++ _Tp load(memory_order = memory_order_seq_cst) const volatile _NOEXCEPT
++ { const lock_type g(const_cast<mutex&>(__lock_)); return na(); }
++ _LIBCPP_INLINE_VISIBILITY
++ _Tp load(memory_order = memory_order_seq_cst) const _NOEXCEPT
++ { const lock_type g(__lock_); return na(); }
++ _LIBCPP_INLINE_VISIBILITY
++ operator _Tp() const volatile _NOEXCEPT {return load();}
++ _LIBCPP_INLINE_VISIBILITY
++ operator _Tp() const _NOEXCEPT {return load();}
++ _LIBCPP_INLINE_VISIBILITY
++ _Tp exchange(_Tp __d, memory_order = memory_order_seq_cst) volatile _NOEXCEPT
++ { const lock_type g(const_cast<mutex&>(__lock_));
++ // or use std::swap
++ const _Tp ret = na(); na() = __d; return ret; }
++ _LIBCPP_INLINE_VISIBILITY
++ _Tp exchange(_Tp __d, memory_order = memory_order_seq_cst) _NOEXCEPT
++ { const lock_type g(__lock_);
++ // or use std::swap
++ const _Tp ret = na(); na() = __d; return ret; }
++ _LIBCPP_INLINE_VISIBILITY
++ bool compare_exchange_weak(_Tp& __e, _Tp __d,
++ memory_order __s, memory_order __f) volatile _NOEXCEPT
++ { const lock_type g(const_cast<mutex&>(__lock_));
++ if (na() == __e) { na() = __d; return true; }
++ else { __e = na(); return false; }
++ }
++ _LIBCPP_INLINE_VISIBILITY
++ bool compare_exchange_weak(_Tp& __e, _Tp __d,
++ memory_order __s, memory_order __f) _NOEXCEPT
++ { const lock_type g(__lock_);
++ if (na() == __e) { na() = __d; return true; }
++ else { __e = na(); return false; }
++ }
++
++ // for now, _weak inditinguishable from _strong
++ _LIBCPP_INLINE_VISIBILITY
++ bool compare_exchange_strong(_Tp& __e, _Tp __d,
++ memory_order __s, memory_order __f) volatile _NOEXCEPT
++ {return compare_exchange_weak(__e, __d, __s, __f);}
++ _LIBCPP_INLINE_VISIBILITY
++ bool compare_exchange_strong(_Tp& __e, _Tp __d,
++ memory_order __s, memory_order __f) _NOEXCEPT
++ {return compare_exchange_weak(__e, __d, __s, __f);}
++ _LIBCPP_INLINE_VISIBILITY
++ bool compare_exchange_weak(_Tp& __e, _Tp __d,
++ memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT
++ {return compare_exchange_weak(__e, __d, __m, __m);}
++ _LIBCPP_INLINE_VISIBILITY
++ bool compare_exchange_weak(_Tp& __e, _Tp __d,
++ memory_order __m = memory_order_seq_cst) _NOEXCEPT
++ {return compare_exchange_weak(__e, __d, __m, __m);}
++ _LIBCPP_INLINE_VISIBILITY
++ bool compare_exchange_strong(_Tp& __e, _Tp __d,
++ memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT
++ {return compare_exchange_strong(__e, __d, __m, __m);}
++ _LIBCPP_INLINE_VISIBILITY
++ bool compare_exchange_strong(_Tp& __e, _Tp __d,
++ memory_order __m = memory_order_seq_cst) _NOEXCEPT
++ {return compare_exchange_strong(__e, __d, __m, __m);}
++
++ _LIBCPP_INLINE_VISIBILITY
++#ifndef _LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS
++ __atomic_mutex_locked() _NOEXCEPT = default;
++#else
++ __atomic_mutex_locked() _NOEXCEPT : __a_() {}
++#endif // _LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS
++
++ _LIBCPP_INLINE_VISIBILITY
++ _LIBCPP_CONSTEXPR __atomic_mutex_locked(_Tp __d) _NOEXCEPT : __a_(__d) {}
++#ifndef _LIBCPP_HAS_NO_DELETED_FUNCTIONS
++ __atomic_mutex_locked(const __atomic_mutex_locked&) = delete;
++ __atomic_mutex_locked& operator=(const __atomic_mutex_locked&) = delete;
++ __atomic_mutex_locked& operator=(const __atomic_mutex_locked&) volatile = delete;
++#else // _LIBCPP_HAS_NO_DELETED_FUNCTIONS
++private:
++ __atomic_mutex_locked(const __atomic_mutex_locked&);
++ __atomic_mutex_locked& operator=(const __atomic_mutex_locked&);
++ __atomic_mutex_locked& operator=(const __atomic_mutex_locked&) volatile;
++#endif // _LIBCPP_HAS_NO_DELETED_FUNCTIONS
++}; // end struct __atomic_mutex_locked
++
++// atomic<Integral>
++
++template <class _Tp>
++struct __atomic_mutex_locked<_Tp, true>
++ : public __atomic_mutex_locked<_Tp, false>
++{
++ typedef __atomic_mutex_locked<_Tp, false> __base;
++ typedef typename __base::lock_type lock_type;
++ using __base::__lock_;
++ using __base::na;
++
++ _LIBCPP_INLINE_VISIBILITY
++ __atomic_mutex_locked() _NOEXCEPT _LIBCPP_DEFAULT
++ _LIBCPP_INLINE_VISIBILITY
++ _LIBCPP_CONSTEXPR __atomic_mutex_locked(_Tp __d) _NOEXCEPT : __base(__d) {}
++
++ _LIBCPP_INLINE_VISIBILITY
++ _Tp fetch_add(_Tp __op, memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT
++ { const lock_type g(const_cast<mutex&>(__lock_));
++ const _Tp ret = na(); na() += __op; return ret;
++ }
++ _LIBCPP_INLINE_VISIBILITY
++ _Tp fetch_add(_Tp __op, memory_order __m = memory_order_seq_cst) _NOEXCEPT
++ { const lock_type g(__lock_);
++ const _Tp ret = na(); na() += __op; return ret;
++ }
++ _LIBCPP_INLINE_VISIBILITY
++ _Tp fetch_sub(_Tp __op, memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT
++ { const lock_type g(const_cast<mutex&>(__lock_));
++ const _Tp ret = na(); na() -= __op; return ret;
++ }
++ _LIBCPP_INLINE_VISIBILITY
++ _Tp fetch_sub(_Tp __op, memory_order __m = memory_order_seq_cst) _NOEXCEPT
++ { const lock_type g(__lock_);
++ const _Tp ret = na(); na() -= __op; return ret;
++ }
++ _LIBCPP_INLINE_VISIBILITY
++ _Tp fetch_and(_Tp __op, memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT
++ { const lock_type g(const_cast<mutex&>(__lock_));
++ const _Tp ret = na(); na() &= __op; return ret;
++ }
++ _LIBCPP_INLINE_VISIBILITY
++ _Tp fetch_and(_Tp __op, memory_order __m = memory_order_seq_cst) _NOEXCEPT
++ { const lock_type g(__lock_);
++ const _Tp ret = na(); na() &= __op; return ret;
++ }
++ _LIBCPP_INLINE_VISIBILITY
++ _Tp fetch_or(_Tp __op, memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT
++ { const lock_type g(const_cast<mutex&>(__lock_));
++ const _Tp ret = na(); na() |= __op; return ret;
++ }
++ _LIBCPP_INLINE_VISIBILITY
++ _Tp fetch_or(_Tp __op, memory_order __m = memory_order_seq_cst) _NOEXCEPT
++ { const lock_type g(__lock_);
++ const _Tp ret = na(); na() |= __op; return ret;
++ }
++ _LIBCPP_INLINE_VISIBILITY
++ _Tp fetch_xor(_Tp __op, memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT
++ { const lock_type g(const_cast<mutex&>(__lock_));
++ const _Tp ret = na(); na() ^= __op; return ret;
++ }
++ _LIBCPP_INLINE_VISIBILITY
++ _Tp fetch_xor(_Tp __op, memory_order __m = memory_order_seq_cst) _NOEXCEPT
++ { const lock_type g(__lock_);
++ const _Tp ret = na(); na() ^= __op; return ret;
++ }
++
++ _LIBCPP_INLINE_VISIBILITY
++ _Tp operator++(int) volatile _NOEXCEPT {return fetch_add(_Tp(1));}
++ _LIBCPP_INLINE_VISIBILITY
++ _Tp operator++(int) _NOEXCEPT {return fetch_add(_Tp(1));}
++ _LIBCPP_INLINE_VISIBILITY
++ _Tp operator--(int) volatile _NOEXCEPT {return fetch_sub(_Tp(1));}
++ _LIBCPP_INLINE_VISIBILITY
++ _Tp operator--(int) _NOEXCEPT {return fetch_sub(_Tp(1));}
++ _LIBCPP_INLINE_VISIBILITY
++ _Tp operator++() volatile _NOEXCEPT {return fetch_add(_Tp(1)) + _Tp(1);}
++ _LIBCPP_INLINE_VISIBILITY
++ _Tp operator++() _NOEXCEPT {return fetch_add(_Tp(1)) + _Tp(1);}
++ _LIBCPP_INLINE_VISIBILITY
++ _Tp operator--() volatile _NOEXCEPT {return fetch_sub(_Tp(1)) - _Tp(1);}
++ _LIBCPP_INLINE_VISIBILITY
++ _Tp operator--() _NOEXCEPT {return fetch_sub(_Tp(1)) - _Tp(1);}
++ _LIBCPP_INLINE_VISIBILITY
++ _Tp operator+=(_Tp __op) volatile _NOEXCEPT {return fetch_add(__op) + __op;}
++ _LIBCPP_INLINE_VISIBILITY
++ _Tp operator+=(_Tp __op) _NOEXCEPT {return fetch_add(__op) + __op;}
++ _LIBCPP_INLINE_VISIBILITY
++ _Tp operator-=(_Tp __op) volatile _NOEXCEPT {return fetch_sub(__op) - __op;}
++ _LIBCPP_INLINE_VISIBILITY
++ _Tp operator-=(_Tp __op) _NOEXCEPT {return fetch_sub(__op) - __op;}
++ _LIBCPP_INLINE_VISIBILITY
++ _Tp operator&=(_Tp __op) volatile _NOEXCEPT {return fetch_and(__op) & __op;}
++ _LIBCPP_INLINE_VISIBILITY
++ _Tp operator&=(_Tp __op) _NOEXCEPT {return fetch_and(__op) & __op;}
++ _LIBCPP_INLINE_VISIBILITY
++ _Tp operator|=(_Tp __op) volatile _NOEXCEPT {return fetch_or(__op) | __op;}
++ _LIBCPP_INLINE_VISIBILITY
++ _Tp operator|=(_Tp __op) _NOEXCEPT {return fetch_or(__op) | __op;}
++ _LIBCPP_INLINE_VISIBILITY
++ _Tp operator^=(_Tp __op) volatile _NOEXCEPT {return fetch_xor(__op) ^ __op;}
++ _LIBCPP_INLINE_VISIBILITY
++ _Tp operator^=(_Tp __op) _NOEXCEPT {return fetch_xor(__op) ^ __op;}
++};
++
++_LIBCPP_END_NAMESPACE_STD
++
++#endif // _LIBCPP_ATOMIC_LOCKED
+diff --git llvm_release_34/projects/libcxx/include/atomic macports_release_34/projects/libcxx/include/atomic
+index f6ab1cb..e580315 100644
+--- llvm_release_34/projects/libcxx/include/atomic
++++ macports_release_34/projects/libcxx/include/atomic
+@@ -1528,4 +1528,50 @@ typedef atomic<uintmax_t> atomic_uintmax_t;
+
+ _LIBCPP_END_NAMESPACE_STD
+
++#if defined(__ppc__) && !defined(__ppc64__)
++// specialize fallback implementation where 64b atomics are missing
++#include <__atomic_locked>
++
++_LIBCPP_BEGIN_NAMESPACE_STD
++
++template <>
++struct atomic<long long> : public __atomic_mutex_locked<long long>
++{
++ typedef long long _Tp;
++ typedef __atomic_mutex_locked<_Tp> __base;
++ _LIBCPP_INLINE_VISIBILITY
++ atomic() _NOEXCEPT _LIBCPP_DEFAULT
++ _LIBCPP_INLINE_VISIBILITY
++ _LIBCPP_CONSTEXPR atomic(_Tp __d) _NOEXCEPT : __base(__d) {}
++
++ _LIBCPP_INLINE_VISIBILITY
++ _Tp operator=(_Tp __d) volatile _NOEXCEPT
++ {__base::store(__d); return __d;}
++ _LIBCPP_INLINE_VISIBILITY
++ _Tp operator=(_Tp __d) _NOEXCEPT
++ {__base::store(__d); return __d;}
++};
++
++template <>
++struct atomic<unsigned long long> :
++ public __atomic_mutex_locked<unsigned long long>
++{
++ typedef unsigned long long _Tp;
++ typedef __atomic_mutex_locked<_Tp> __base;
++ _LIBCPP_INLINE_VISIBILITY
++ atomic() _NOEXCEPT _LIBCPP_DEFAULT
++ _LIBCPP_INLINE_VISIBILITY
++ _LIBCPP_CONSTEXPR atomic(_Tp __d) _NOEXCEPT : __base(__d) {}
++
++ _LIBCPP_INLINE_VISIBILITY
++ _Tp operator=(_Tp __d) volatile _NOEXCEPT
++ {__base::store(__d); return __d;}
++ _LIBCPP_INLINE_VISIBILITY
++ _Tp operator=(_Tp __d) _NOEXCEPT
++ {__base::store(__d); return __d;}
++};
++
++_LIBCPP_END_NAMESPACE_STD
++#endif // defined(__ppc__) && !defined(__ppc64__)
++
+ #endif // _LIBCPP_ATOMIC
+--
+2.2.2
+
Deleted: trunk/dports/lang/llvm-3.4/files/clang-format.patch
===================================================================
--- trunk/dports/lang/llvm-3.4/files/clang-format.patch 2015-01-18 07:55:28 UTC (rev 131770)
+++ trunk/dports/lang/llvm-3.4/files/clang-format.patch 2015-01-18 08:03:56 UTC (rev 131771)
@@ -1,79 +0,0 @@
-Index: llvm-3.4.2.src/tools/clang/tools/clang-format/clang-format-bbedit.applescript
-===================================================================
---- llvm-3.4.2.src.orig/tools/clang/tools/clang-format/clang-format-bbedit.applescript
-+++ llvm-3.4.2.src/tools/clang/tools/clang-format/clang-format-bbedit.applescript
-@@ -15,7 +15,7 @@ tell application "BBEdit"
- end tell
-
- set filePath to urlToPOSIXPath(fileURL)
--set newContents to do shell script "/path/to/clang-format -offset=" & selectionOffset & " -length=" & selectionLength & " " & quoted form of filePath
-+set newContents to do shell script "@CLANG_FORMAT_PATH@ -offset=" & selectionOffset & " -length=" & selectionLength & " " & quoted form of filePath
-
- tell application "BBEdit"
- -- "set contents of text document 1 to newContents" scrolls to the bottom while
-Index: llvm-3.4.2.src/tools/clang/tools/clang-format/clang-format-diff.py
-===================================================================
---- llvm-3.4.2.src.orig/tools/clang/tools/clang-format/clang-format-diff.py
-+++ llvm-3.4.2.src/tools/clang/tools/clang-format/clang-format-diff.py
-@@ -31,7 +31,7 @@ import sys
-
-
- # Change this to the full path if clang-format is not on the path.
--binary = 'clang-format'
-+binary = '@CLANG_FORMAT_PATH@'
-
-
- def main():
-Index: llvm-3.4.2.src/tools/clang/tools/clang-format/clang-format.el
-===================================================================
---- llvm-3.4.2.src.orig/tools/clang/tools/clang-format/clang-format.el
-+++ llvm-3.4.2.src/tools/clang/tools/clang-format/clang-format.el
-@@ -13,7 +13,7 @@
-
- ;; *Location of the clang-format binary. If it is on your PATH, a full path name
- ;; need not be specified.
--(defvar clang-format-binary "clang-format")
-+(defvar clang-format-binary "@CLANG_FORMAT_PATH@")
-
- (defun clang-format-region ()
- "Use clang-format to format the currently active region."
-Index: llvm-3.4.2.src/tools/clang/tools/clang-format/clang-format.py
-===================================================================
---- llvm-3.4.2.src.orig/tools/clang/tools/clang-format/clang-format.py
-+++ llvm-3.4.2.src/tools/clang/tools/clang-format/clang-format.py
-@@ -24,7 +24,7 @@ import sys
- import vim
-
- # Change this to the full path if clang-format is not on the path.
--binary = 'clang-format'
-+binary = '@CLANG_FORMAT_PATH@'
-
- # 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
-Index: llvm-3.4.2.src/tools/clang/tools/clang-format/clang-format-sublime.py
-===================================================================
---- llvm-3.4.2.src.orig/tools/clang/tools/clang-format/clang-format-sublime.py
-+++ llvm-3.4.2.src/tools/clang/tools/clang-format/clang-format-sublime.py
-@@ -18,7 +18,7 @@ import sublime_plugin
- import subprocess
-
- # Change this to the full path if clang-format is not on the path.
--binary = 'clang-format'
-+binary = '@CLANG_FORMAT_PATH@'
-
- # 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
-Index: llvm-3.4.2.src/Makefile
-===================================================================
---- llvm-3.4.2.src.orig/Makefile
-+++ llvm-3.4.2.src/Makefile
-@@ -71,7 +71,8 @@ ifeq ($(MAKECMDGOALS),install-clang)
- tools/clang/tools/libclang \
- tools/clang/tools/c-index-test \
- tools/clang/runtime tools/clang/docs \
-- tools/clang/include tools/clang/lib
-+ tools/clang/include tools/clang/lib \
-+ tools/clang/tools/clang-format
- OPTIONAL_DIRS :=
- NO_INSTALL = 1
- endif
Deleted: trunk/dports/lang/llvm-3.4/files/clang-modernize.patch
===================================================================
--- trunk/dports/lang/llvm-3.4/files/clang-modernize.patch 2015-01-18 07:55:28 UTC (rev 131770)
+++ trunk/dports/lang/llvm-3.4/files/clang-modernize.patch 2015-01-18 08:03:56 UTC (rev 131771)
@@ -1,13 +0,0 @@
---- a/Makefile 2014-05-29 08:40:41.000000000 -0500
-+++ b/Makefile 2014-05-29 08:41:52.000000000 -0500
-@@ -72,7 +72,9 @@
- tools/clang/tools/c-index-test \
- tools/clang/runtime tools/clang/docs \
- tools/clang/include tools/clang/lib \
-- tools/clang/tools/clang-format
-+ tools/clang/tools/clang-format \
-+ tools/clang/tools/extra/clang-modernize \
-+ tools/clang/tools/extra/clang-apply-replacements
- OPTIONAL_DIRS :=
- NO_INSTALL = 1
- endif
Deleted: trunk/dports/lang/llvm-3.4/files/fix-clang-dylib-ids.patch
===================================================================
--- trunk/dports/lang/llvm-3.4/files/fix-clang-dylib-ids.patch 2015-01-18 07:55:28 UTC (rev 131770)
+++ trunk/dports/lang/llvm-3.4/files/fix-clang-dylib-ids.patch 2015-01-18 08:03:56 UTC (rev 131771)
@@ -1,40 +0,0 @@
-Index: llvm-3.4.2.src/tools/clang/runtime/compiler-rt/Makefile
-===================================================================
---- llvm-3.4.2.src.orig/tools/clang/runtime/compiler-rt/Makefile
-+++ llvm-3.4.2.src/tools/clang/runtime/compiler-rt/Makefile
-@@ -215,8 +215,6 @@ $(ResourceLibDir)/$1/libclang_rt.%.dylib
- $(ResourceLibDir)/$1/.dir
- $(Echo) Copying runtime library $1/$$* to build dir
- $(Verb) cp $(PROJ_OBJ_DIR)/clang_$1/$$*/libcompiler_rt.dylib $$@
-- $(Echo) Fixing LC_ID_DYLIB of $$@
-- $(Verb) install_name_tool $$@ -id $$@
- RuntimeLibrary.$1: \
- $(RuntimeLibrary.$1.Configs:%=$(ResourceLibDir)/$1/libclang_rt.%)
- .PHONY: RuntimeLibrary.$1
-@@ -236,6 +234,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
-+ $(Verb) install_name_tool $$@ -id $$(patsubst $(DESTDIR)%,%,$$@)
-
- # Rule to install runtime libraries.
- RuntimeLibraryInstall.$1: \
-Index: llvm-3.4.2.src/tools/clang/tools/libclang/Makefile
-===================================================================
---- llvm-3.4.2.src.orig/tools/clang/tools/libclang/Makefile
-+++ llvm-3.4.2.src/tools/clang/tools/libclang/Makefile
-@@ -49,12 +49,8 @@ ifeq ($(HOST_OS),Darwin)
- # Extra options to override libtool defaults.
- LLVMLibsOptions += -Wl,-dead_strip
-
-- # Mac OS X 10.4 and earlier tools do not allow a second -install_name on command line
-- DARWIN_VERS := $(shell echo $(TARGET_TRIPLE) | sed 's/.*darwin\([0-9]*\).*/\1/')
-- ifneq ($(DARWIN_VERS),8)
-- LLVMLibsOptions += -Wl,-install_name \
-- -Wl,"@rpath/lib$(LIBRARYNAME)$(SHLIBEXT)"
-- endif
-+ # $(CLANG_LEVEL)/../../Makefile.rules has been patched to set the
-+ # install name for all dylibs.
-
- # If we're doing an Apple-style build, add the LTO object path.
- ifeq ($(RC_XBS),YES)
Added: trunk/dports/lang/llvm-3.4/files/fix-clang-dylib-ids.patch
===================================================================
--- trunk/dports/lang/llvm-3.4/files/fix-clang-dylib-ids.patch (rev 0)
+++ trunk/dports/lang/llvm-3.4/files/fix-clang-dylib-ids.patch 2015-01-18 08:03:56 UTC (rev 131771)
@@ -0,0 +1,19 @@
+Index: llvm-3.4.2.src/tools/clang/tools/libclang/Makefile
+===================================================================
+--- llvm-3.4.2.src.orig/tools/clang/tools/libclang/Makefile
++++ llvm-3.4.2.src/tools/clang/tools/libclang/Makefile
+@@ -49,12 +49,8 @@ ifeq ($(HOST_OS),Darwin)
+ # Extra options to override libtool defaults.
+ LLVMLibsOptions += -Wl,-dead_strip
+
+- # Mac OS X 10.4 and earlier tools do not allow a second -install_name on command line
+- DARWIN_VERS := $(shell echo $(TARGET_TRIPLE) | sed 's/.*darwin\([0-9]*\).*/\1/')
+- ifneq ($(DARWIN_VERS),8)
+- LLVMLibsOptions += -Wl,-install_name \
+- -Wl,"@rpath/lib$(LIBRARYNAME)$(SHLIBEXT)"
+- endif
++ # $(CLANG_LEVEL)/../../Makefile.rules has been patched to set the
++ # install name for all dylibs.
+
+ # If we're doing an Apple-style build, add the LTO object path.
+ ifeq ($(RC_XBS),YES)
Deleted: trunk/dports/lang/llvm-3.4/files/fix-dylib-ids.patch
===================================================================
--- trunk/dports/lang/llvm-3.4/files/fix-dylib-ids.patch 2015-01-18 07:55:28 UTC (rev 131770)
+++ trunk/dports/lang/llvm-3.4/files/fix-dylib-ids.patch 2015-01-18 08:03:56 UTC (rev 131771)
@@ -1,62 +0,0 @@
-Index: llvm-3.4.2.src/tools/llvm-shlib/Makefile
-===================================================================
---- llvm-3.4.2.src.orig/tools/llvm-shlib/Makefile
-+++ llvm-3.4.2.src/tools/llvm-shlib/Makefile
-@@ -55,13 +55,8 @@ ifeq ($(HOST_OS),Darwin)
- LLVMLibsOptions := $(LLVMLibsOptions) \
- -Wl,-dead_strip
-
-- # Mac OS X 10.4 and earlier tools do not allow a second -install_name on command line
-- DARWIN_VERS := $(shell echo $(TARGET_TRIPLE) | sed 's/.*darwin\([0-9]*\).*/\1/')
-- ifneq ($(DARWIN_VERS),8)
-- LLVMLibsOptions := $(LLVMLibsOptions) \
-- -Wl,-install_name \
-- -Wl,"@rpath/lib$(LIBRARYNAME)$(SHLIBEXT)"
-- endif
-+ # $(LEVEL)/Makefile.rules has been patched to set the install name
-+ # for all dylibs.
- endif
-
- ifeq ($(HOST_OS), $(filter $(HOST_OS), DragonFly Linux FreeBSD GNU/kFreeBSD OpenBSD GNU Bitrig))
-Index: llvm-3.4.2.src/tools/lto/Makefile
-===================================================================
---- llvm-3.4.2.src.orig/tools/lto/Makefile
-+++ llvm-3.4.2.src/tools/lto/Makefile
-@@ -41,13 +41,8 @@ ifeq ($(HOST_OS),Darwin)
- LLVMLibsOptions := $(LLVMLibsOptions) \
- -Wl,-dead_strip
-
-- # Mac OS X 10.4 and earlier tools do not allow a second -install_name on command line
-- DARWIN_VERS := $(shell echo $(TARGET_TRIPLE) | sed 's/.*darwin\([0-9]*\).*/\1/')
-- ifneq ($(DARWIN_VERS),8)
-- LLVMLibsOptions := $(LLVMLibsOptions) \
-- -Wl,-install_name \
-- -Wl,"@executable_path/../lib/lib$(LIBRARYNAME)$(SHLIBEXT)"
-- endif
-+ # $(LEVEL)/Makefile.rules has been patched to set the install name
-+ # for all dylibs.
-
- # If we're doing an Apple-style build, add the LTO object path.
- ifeq ($(RC_XBS),YES)
-Index: llvm-3.4.2.src/Makefile.rules
-===================================================================
---- llvm-3.4.2.src.orig/Makefile.rules
-+++ llvm-3.4.2.src/Makefile.rules
-@@ -581,6 +581,17 @@ ifdef SHARED_LIBRARY
- ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW))
- ifneq ($(HOST_OS),Darwin)
- LD.Flags += $(RPATH) -Wl,'$$ORIGIN'
-+else
-+ ifeq ($(DARWIN_MAJVERS),4)
-+ LD.Flags += -Wl,-dylib_install_name
-+ else
-+ LD.Flags += -Wl,-install_name
-+ endif
-+ ifdef LOADABLE_MODULE
-+ LD.Flags += -Wl,"$(PROJ_libdir)/$(LIBRARYNAME)$(SHLIBEXT)"
-+ else
-+ LD.Flags += -Wl,"$(PROJ_libdir)/$(SharedPrefix)$(LIBRARYNAME)$(SHLIBEXT)"
-+ endif
- endif
- endif
- endif
Added: trunk/dports/lang/llvm-3.4/files/fix-dylib-ids.patch
===================================================================
--- trunk/dports/lang/llvm-3.4/files/fix-dylib-ids.patch (rev 0)
+++ trunk/dports/lang/llvm-3.4/files/fix-dylib-ids.patch 2015-01-18 08:03:56 UTC (rev 131771)
@@ -0,0 +1,62 @@
+Index: llvm-3.4.2.src/tools/llvm-shlib/Makefile
+===================================================================
+--- llvm-3.4.2.src.orig/tools/llvm-shlib/Makefile
++++ llvm-3.4.2.src/tools/llvm-shlib/Makefile
+@@ -55,13 +55,8 @@ ifeq ($(HOST_OS),Darwin)
+ LLVMLibsOptions := $(LLVMLibsOptions) \
+ -Wl,-dead_strip
+
+- # Mac OS X 10.4 and earlier tools do not allow a second -install_name on command line
+- DARWIN_VERS := $(shell echo $(TARGET_TRIPLE) | sed 's/.*darwin\([0-9]*\).*/\1/')
+- ifneq ($(DARWIN_VERS),8)
+- LLVMLibsOptions := $(LLVMLibsOptions) \
+- -Wl,-install_name \
+- -Wl,"@rpath/lib$(LIBRARYNAME)$(SHLIBEXT)"
+- endif
++ # $(LEVEL)/Makefile.rules has been patched to set the install name
++ # for all dylibs.
+ endif
+
+ ifeq ($(HOST_OS), $(filter $(HOST_OS), DragonFly Linux FreeBSD GNU/kFreeBSD OpenBSD GNU Bitrig))
+Index: llvm-3.4.2.src/tools/lto/Makefile
+===================================================================
+--- llvm-3.4.2.src.orig/tools/lto/Makefile
++++ llvm-3.4.2.src/tools/lto/Makefile
+@@ -41,13 +41,8 @@ ifeq ($(HOST_OS),Darwin)
+ LLVMLibsOptions := $(LLVMLibsOptions) \
+ -Wl,-dead_strip
+
+- # Mac OS X 10.4 and earlier tools do not allow a second -install_name on command line
+- DARWIN_VERS := $(shell echo $(TARGET_TRIPLE) | sed 's/.*darwin\([0-9]*\).*/\1/')
+- ifneq ($(DARWIN_VERS),8)
+- LLVMLibsOptions := $(LLVMLibsOptions) \
+- -Wl,-install_name \
+- -Wl,"@executable_path/../lib/lib$(LIBRARYNAME)$(SHLIBEXT)"
+- endif
++ # $(LEVEL)/Makefile.rules has been patched to set the install name
++ # for all dylibs.
+
+ # If we're doing an Apple-style build, add the LTO object path.
+ ifeq ($(RC_XBS),YES)
+Index: llvm-3.4.2.src/Makefile.rules
+===================================================================
+--- llvm-3.4.2.src.orig/Makefile.rules
++++ llvm-3.4.2.src/Makefile.rules
+@@ -581,6 +581,17 @@ ifdef SHARED_LIBRARY
+ ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW))
+ ifneq ($(HOST_OS),Darwin)
+ LD.Flags += $(RPATH) -Wl,'$$ORIGIN'
++else
++ ifeq ($(DARWIN_MAJVERS),4)
++ LD.Flags += -Wl,-dylib_install_name
++ else
++ LD.Flags += -Wl,-install_name
++ endif
++ ifdef LOADABLE_MODULE
++ LD.Flags += -Wl,"$(PROJ_libdir)/$(LIBRARYNAME)$(SHLIBEXT)"
++ else
++ LD.Flags += -Wl,"$(PROJ_libdir)/$(SharedPrefix)$(LIBRARYNAME)$(SHLIBEXT)"
++ endif
+ endif
+ endif
+ endif
Deleted: trunk/dports/lang/llvm-3.4/files/install_target.patch
===================================================================
--- trunk/dports/lang/llvm-3.4/files/install_target.patch 2015-01-18 07:55:28 UTC (rev 131770)
+++ trunk/dports/lang/llvm-3.4/files/install_target.patch 2015-01-18 08:03:56 UTC (rev 131771)
@@ -1,13 +0,0 @@
---- a/Makefile 2013-10-02 08:42:23.000000000 -0700
-+++ b/Makefile 2013-10-24 10:57:33.000000000 -0700
-@@ -70,9 +70,8 @@ ifeq ($(MAKECMDGOALS),install-clang)
- DIRS := tools/clang/tools/driver tools/clang/lib/Headers \
- tools/clang/tools/libclang \
- tools/clang/tools/c-index-test \
-- tools/clang/include/clang-c \
- tools/clang/runtime tools/clang/docs \
-- tools/lto
-+ tools/clang/include tools/clang/lib
- OPTIONAL_DIRS :=
- NO_INSTALL = 1
- endif
Copied: trunk/dports/lang/llvm-3.4/files/leopard-no-blocks.patch (from rev 131761, trunk/dports/lang/llvm-3.4/files/0001-Leopard-Default-to-fno-blocks.patch)
===================================================================
--- trunk/dports/lang/llvm-3.4/files/leopard-no-blocks.patch (rev 0)
+++ trunk/dports/lang/llvm-3.4/files/leopard-no-blocks.patch 2015-01-18 08:03:56 UTC (rev 131771)
@@ -0,0 +1,26 @@
+From 2500edffc9f1f44983927351eb60d4fe1cee4bcd Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Wed, 7 Jan 2015 03:42:15 -0800
+Subject: [PATCH] Leopard: Default to -fno-blocks
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ lib/Driver/ToolChains.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/Driver/ToolChains.h b/lib/Driver/ToolChains.h
+index 876bb01..27aa2ee 100644
+--- a/tools/clang/lib/Driver/ToolChains.h
++++ b/tools/clang/lib/Driver/ToolChains.h
+@@ -257,7 +257,7 @@ public:
+ bool IsBlocksDefault() const override {
+ // Always allow blocks on Apple; users interested in versioning are
+ // expected to use /usr/include/Blocks.h.
+- return true;
++ return false;
+ }
+ bool IsIntegratedAssemblerDefault() const override {
+ // Default integrated assembler to on for Apple's MachO targets.
+--
+2.2.1
+
Deleted: trunk/dports/lang/llvm-3.4/files/move-clang-resources.patch
===================================================================
--- trunk/dports/lang/llvm-3.4/files/move-clang-resources.patch 2015-01-18 07:55:28 UTC (rev 131770)
+++ trunk/dports/lang/llvm-3.4/files/move-clang-resources.patch 2015-01-18 08:03:56 UTC (rev 131771)
@@ -1,59 +0,0 @@
-Index: llvm-3.4.2.src/tools/clang/lib/Headers/Makefile
-===================================================================
---- llvm-3.4.2.src.orig/tools/clang/lib/Headers/Makefile
-+++ llvm-3.4.2.src/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.map: $(PROJ_SRC_DIR)
- # Hook into the standard Makefile rules.
- all-local:: $(OBJHEADERS) $(HeaderDir)/module.map
-
--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
-Index: llvm-3.4.2.src/tools/clang/runtime/compiler-rt/Makefile
-===================================================================
---- llvm-3.4.2.src.orig/tools/clang/runtime/compiler-rt/Makefile
-+++ llvm-3.4.2.src/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
-@@ -255,9 +256,21 @@ $(PROJ_resources_include)/sanitizer: $(R
- 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
Deleted: trunk/dports/lang/llvm-3.4/files/scan-build-PR-35006.patch
===================================================================
--- trunk/dports/lang/llvm-3.4/files/scan-build-PR-35006.patch 2015-01-18 07:55:28 UTC (rev 131770)
+++ trunk/dports/lang/llvm-3.4/files/scan-build-PR-35006.patch 2015-01-18 08:03:56 UTC (rev 131771)
@@ -1,13 +0,0 @@
-Index: llvm-3.4.2.src/tools/clang/tools/scan-build/scan-build
-===================================================================
---- llvm-3.4.2.src.orig/tools/clang/tools/scan-build/scan-build
-+++ llvm-3.4.2.src/tools/clang/tools/scan-build/scan-build
-@@ -1677,6 +1677,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");
-+ 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";
- }
Deleted: trunk/dports/lang/llvm-3.4/files/skip-python-check.patch
===================================================================
--- trunk/dports/lang/llvm-3.4/files/skip-python-check.patch 2015-01-18 07:55:28 UTC (rev 131770)
+++ trunk/dports/lang/llvm-3.4/files/skip-python-check.patch 2015-01-18 08:03:56 UTC (rev 131771)
@@ -1,98 +0,0 @@
-Index: llvm-3.4.2.src/configure
-===================================================================
---- llvm-3.4.2.src.orig/configure
-+++ llvm-3.4.2.src/configure
-@@ -11769,93 +11769,6 @@ fi
- echo "${ECHO_T}$NO_VARIADIC_MACROS $NO_MISSING_FIELD_INITIALIZERS $COVERED_SWITCH_DEFAULT $NO_UNINITIALIZED $NO_MAYBE_UNINITIALIZED" >&6; }
-
-
--# Check whether --with-python was given.
--if test "${with_python+set}" = set; then
-- withval=$with_python; PYTHON="$withval"
--fi
--
--
--if test -n "$PYTHON" && test -x "$PYTHON" ; then
-- { echo "$as_me:$LINENO: checking for python" >&5
--echo $ECHO_N "checking for python... $ECHO_C" >&6; }
-- { echo "$as_me:$LINENO: result: user defined: $with_python" >&5
--echo "${ECHO_T}user defined: $with_python" >&6; }
--else
-- if test -n "$PYTHON" ; then
-- { echo "$as_me:$LINENO: WARNING: specified python ($PYTHON) is not usable, searching path" >&5
--echo "$as_me: WARNING: specified python ($PYTHON) is not usable, searching path" >&2;}
-- fi
--
-- # Extract the first word of "python python2 python26", so it can be a program name with args.
--set dummy python python2 python26; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
--if test "${ac_cv_path_PYTHON+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- case $PYTHON in
-- [\\/]* | ?:[\\/]*)
-- ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path.
-- ;;
-- *)
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
--IFS=$as_save_IFS
--
-- test -z "$ac_cv_path_PYTHON" && ac_cv_path_PYTHON="{ echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6; }
-- { { echo "$as_me:$LINENO: error: could not find python 2.5 or higher" >&5
--echo "$as_me: error: could not find python 2.5 or higher" >&2;}
-- { (exit 1); exit 1; }; }"
-- ;;
--esac
--fi
--PYTHON=$ac_cv_path_PYTHON
--if test -n "$PYTHON"; then
-- { echo "$as_me:$LINENO: result: $PYTHON" >&5
--echo "${ECHO_T}$PYTHON" >&6; }
--else
-- { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
--fi
--
--
--fi
--
--{ echo "$as_me:$LINENO: checking for python >= 2.5" >&5
--echo $ECHO_N "checking for python >= 2.5... $ECHO_C" >&6; }
--ac_python_version=`$PYTHON -V 2>&1 | cut -d' ' -f2`
--ac_python_version_major=`echo $ac_python_version | cut -d'.' -f1`
--ac_python_version_minor=`echo $ac_python_version | cut -d'.' -f2`
--ac_python_version_patch=`echo $ac_python_version | cut -d'.' -f3`
--if test "$ac_python_version_major" -gt "2" || \
-- (test "$ac_python_version_major" -eq "2" && \
-- test "$ac_python_version_minor" -ge "5") ; then
-- { echo "$as_me:$LINENO: result: $PYTHON ($ac_python_version)" >&5
--echo "${ECHO_T}$PYTHON ($ac_python_version)" >&6; }
--else
-- { echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6; }
-- { { echo "$as_me:$LINENO: error: found python $ac_python_version ($PYTHON); required >= 2.5
--See \`config.log' for more details." >&5
--echo "$as_me: error: found python $ac_python_version ($PYTHON); required >= 2.5
--See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }
--fi
--
--
--
- { echo "$as_me:$LINENO: checking for sin in -lm" >&5
- echo $ECHO_N "checking for sin in -lm... $ECHO_C" >&6; }
- if test "${ac_cv_lib_m_sin+set}" = set; then
Deleted: trunk/dports/lang/llvm-3.4/files/snowleopard-cmath.patch
===================================================================
--- trunk/dports/lang/llvm-3.4/files/snowleopard-cmath.patch 2015-01-18 07:55:28 UTC (rev 131770)
+++ trunk/dports/lang/llvm-3.4/files/snowleopard-cmath.patch 2015-01-18 08:03:56 UTC (rev 131771)
@@ -1,25 +0,0 @@
---- a/projects/libcxx/include/cmath 2013-08-29 16:50:48.000000000 -0700
-+++ b/projects/libcxx/include/cmath 2014-04-13 19:01:12.000000000 -0700
-@@ -301,6 +301,22 @@ long double truncl(long double x);
- #include <math.h>
- #include <type_traits>
-
-+#ifdef __APPLE__
-+#include <Availability.h>
-+#if __MAC_OS_X_VERSION_MAX_ALLOWED < 1070
-+/* These prototypes are incorrectly omitted from <math.h> on Snow Leopard despite being available */
-+extern "C" {
-+ extern long long int llrintl(long double);
-+ extern long long int llrint(double);
-+ extern long long int llrintf(float);
-+
-+ extern long long int llroundl(long double);
-+ extern long long int llround(double);
-+ extern long long int llroundf(float);
-+}
-+#endif
-+#endif // __APPLE__
-+
- #ifdef _LIBCPP_MSVCRT
- #include "support/win32/math_win32.h"
- #endif
Deleted: trunk/dports/lang/llvm-3.4/files/tiger-libclang.patch
===================================================================
--- trunk/dports/lang/llvm-3.4/files/tiger-libclang.patch 2015-01-18 07:55:28 UTC (rev 131770)
+++ trunk/dports/lang/llvm-3.4/files/tiger-libclang.patch 2015-01-18 08:03:56 UTC (rev 131771)
@@ -1,13 +0,0 @@
-Index: llvm-3.4.2.src/tools/clang/tools/libclang/CIndex.cpp
-===================================================================
---- llvm-3.4.2.src.orig/tools/clang/tools/libclang/CIndex.cpp
-+++ llvm-3.4.2.src/tools/clang/tools/libclang/CIndex.cpp
-@@ -6518,7 +6518,7 @@ void clang::setThreadBackgroundPriority(
- return;
-
- // FIXME: Move to llvm/Support and make it cross-platform.
--#ifdef __APPLE__
-+#if defined(__APPLE__) && defined(PRIO_DARWIN_THREAD) && defined(PRIO_DARWIN_BG)
- setpriority(PRIO_DARWIN_THREAD, 0, PRIO_DARWIN_BG);
- #endif
- }
Deleted: trunk/dports/lang/llvm-3.4/files/yosemite-deployment-target.patch
===================================================================
--- trunk/dports/lang/llvm-3.4/files/yosemite-deployment-target.patch 2015-01-18 07:55:28 UTC (rev 131770)
+++ trunk/dports/lang/llvm-3.4/files/yosemite-deployment-target.patch 2015-01-18 08:03:56 UTC (rev 131771)
@@ -1,31 +0,0 @@
---- a/tools/clang/lib/Basic/Targets.cpp
-+++ b/tools/clang/lib/Basic/Targets.cpp
-@@ -161,12 +161,22 @@ static void getDarwinDefines(MacroBuilde
- // version.
- assert(Triple.getEnvironmentName().empty() && "Invalid environment!");
- assert(Maj < 100 && Min < 100 && Rev < 100 && "Invalid version!");
-- char Str[5];
-- Str[0] = '0' + (Maj / 10);
-- Str[1] = '0' + (Maj % 10);
-- Str[2] = '0' + std::min(Min, 9U);
-- Str[3] = '0' + std::min(Rev, 9U);
-- Str[4] = '\0';
-+ char Str[7];
-+ if (Maj < 10 || Maj == 10 && Min < 10) {
-+ Str[0] = '0' + (Maj / 10);
-+ Str[1] = '0' + (Maj % 10);
-+ Str[2] = '0' + std::min(Min, 9U);
-+ Str[3] = '0' + std::min(Rev, 9U);
-+ Str[4] = '\0';
-+ } else {
-+ Str[0] = '0' + (Maj / 10);
-+ Str[1] = '0' + (Maj % 10);
-+ Str[2] = '0' + (Min / 10);
-+ Str[3] = '0' + (Min % 10);
-+ Str[4] = '0' + (Rev / 10);
-+ Str[5] = '0' + (Rev % 10);
-+ Str[6] = '\0';
-+ }
- Builder.defineMacro("__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__", Str);
- }
- }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150118/627353e7/attachment-0001.html>
More information about the macports-changes
mailing list