[131762] trunk/dports/lang
jeremyhu at macports.org
jeremyhu at macports.org
Sat Jan 17 18:19:23 PST 2015
Revision: 131762
https://trac.macports.org/changeset/131762
Author: jeremyhu at macports.org
Date: 2015-01-17 18:19:23 -0800 (Sat, 17 Jan 2015)
Log Message:
-----------
llvm-3.[67]: Cleanup patches
Modified Paths:
--------------
trunk/dports/lang/llvm-3.6/Portfile
trunk/dports/lang/llvm-3.6/files/0001-Comment-out-SL-cctools-workaround.patch
trunk/dports/lang/llvm-3.6/files/0001-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch
trunk/dports/lang/llvm-3.6/files/0003-Fix-local-and-iterator-when-building-with-Lion-and-n.patch
trunk/dports/lang/llvm-3.6/files/0004-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch
trunk/dports/lang/llvm-3.6/files/clang-format.patch
trunk/dports/lang/llvm-3.6/files/clang-modernize.patch
trunk/dports/lang/llvm-3.6/files/fix-dylib-ids.patch
trunk/dports/lang/llvm-3.6/files/fix-libclang_rt-dylib-ids.patch
trunk/dports/lang/llvm-3.6/files/install_target.patch
trunk/dports/lang/llvm-3.6/files/lion-xcrun-fallback.patch
trunk/dports/lang/llvm-3.6/files/llvm-integrated-as.patch
trunk/dports/lang/llvm-3.6/files/move-clang-resources.patch
trunk/dports/lang/llvm-3.6/files/scan-build-PR-35006.patch
trunk/dports/lang/llvm-3.6/files/skip-python-check.patch
trunk/dports/lang/llvm-3.6/files/snowleopard-cmath.patch
trunk/dports/lang/llvm-3.7/Portfile
Added Paths:
-----------
trunk/dports/lang/llvm-3.6/files/0001-Set-the-Mach-O-CPU-Subtype-to-ppc7400-when-targeting.patch
trunk/dports/lang/llvm-3.6/files/0002-MacPorts-Only-Update-install-targets-for-clang-subpo.patch
trunk/dports/lang/llvm-3.6/files/0003-MacPorts-Only-Use-full-path-for-the-dylib-id-instead.patch
trunk/dports/lang/llvm-3.6/files/0004-MacPorts-Only-Don-t-embed-the-deployment-target-in-t.patch
trunk/dports/lang/llvm-3.6/files/0005-MacPorts-Only-Skip-checking-for-python-in-configure.patch
trunk/dports/lang/llvm-3.6/files/1001-Default-to-ppc7400-for-OSX-10.5.patch
trunk/dports/lang/llvm-3.6/files/1002-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch
trunk/dports/lang/llvm-3.6/files/1003-MacPorts-Only-Fall-back-on-xcodebuild-sdk-when-xcrun.patch
trunk/dports/lang/llvm-3.6/files/1004-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch
trunk/dports/lang/llvm-3.6/files/1005-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch
trunk/dports/lang/llvm-3.6/files/1006-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch
trunk/dports/lang/llvm-3.6/files/2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch
trunk/dports/lang/llvm-3.6/files/2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch
trunk/dports/lang/llvm-3.6/files/2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch
trunk/dports/lang/llvm-3.6/files/3001-buildit-build-fix-for-Leopard.patch
trunk/dports/lang/llvm-3.6/files/3002-buildit-Set-compatibility-version-to-RC_ProjectSourc.patch
trunk/dports/lang/llvm-3.6/files/3003-Fix-local-and-iterator-when-building-with-Lion-and-n.patch
trunk/dports/lang/llvm-3.6/files/3004-Fix-missing-long-long-math-prototypes-when-using-the.patch
trunk/dports/lang/llvm-3.6/files/3005-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch
trunk/dports/lang/llvm-3.6/files/leopard-no-blocks.patch
trunk/dports/lang/llvm-3.7/files/0001-Set-the-Mach-O-CPU-Subtype-to-ppc7400-when-targeting.patch
trunk/dports/lang/llvm-3.7/files/0002-MacPorts-Only-Update-install-targets-for-clang-subpo.patch
trunk/dports/lang/llvm-3.7/files/0003-MacPorts-Only-Use-full-path-for-the-dylib-id-instead.patch
trunk/dports/lang/llvm-3.7/files/0004-MacPorts-Only-Don-t-embed-the-deployment-target-in-t.patch
trunk/dports/lang/llvm-3.7/files/0005-MacPorts-Only-Skip-checking-for-python-in-configure.patch
trunk/dports/lang/llvm-3.7/files/1001-Default-to-ppc7400-for-OSX-10.5.patch
trunk/dports/lang/llvm-3.7/files/1002-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch
trunk/dports/lang/llvm-3.7/files/1003-MacPorts-Only-Fall-back-on-xcodebuild-sdk-when-xcrun.patch
trunk/dports/lang/llvm-3.7/files/1004-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch
trunk/dports/lang/llvm-3.7/files/1005-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch
trunk/dports/lang/llvm-3.7/files/1006-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch
trunk/dports/lang/llvm-3.7/files/2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch
trunk/dports/lang/llvm-3.7/files/2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch
trunk/dports/lang/llvm-3.7/files/2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch
trunk/dports/lang/llvm-3.7/files/3001-buildit-build-fix-for-Leopard.patch
trunk/dports/lang/llvm-3.7/files/3002-buildit-Set-compatibility-version-to-RC_ProjectSourc.patch
trunk/dports/lang/llvm-3.7/files/3003-Fix-local-and-iterator-when-building-with-Lion-and-n.patch
trunk/dports/lang/llvm-3.7/files/3004-Fix-missing-long-long-math-prototypes-when-using-the.patch
trunk/dports/lang/llvm-3.7/files/3005-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch
trunk/dports/lang/llvm-3.7/files/leopard-no-blocks.patch
Removed Paths:
-------------
trunk/dports/lang/llvm-3.6/files/0001-Leopard-Default-to-fno-blocks.patch
trunk/dports/lang/llvm-3.7/files/0001-Comment-out-SL-cctools-workaround.patch
trunk/dports/lang/llvm-3.7/files/0001-Leopard-Default-to-fno-blocks.patch
trunk/dports/lang/llvm-3.7/files/0001-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch
trunk/dports/lang/llvm-3.7/files/0003-Fix-local-and-iterator-when-building-with-Lion-and-n.patch
trunk/dports/lang/llvm-3.7/files/0004-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch
trunk/dports/lang/llvm-3.7/files/clang-format.patch
trunk/dports/lang/llvm-3.7/files/clang-modernize.patch
trunk/dports/lang/llvm-3.7/files/fix-dylib-ids.patch
trunk/dports/lang/llvm-3.7/files/fix-libclang_rt-dylib-ids.patch
trunk/dports/lang/llvm-3.7/files/install_target.patch
trunk/dports/lang/llvm-3.7/files/lion-xcrun-fallback.patch
trunk/dports/lang/llvm-3.7/files/llvm-integrated-as.patch
trunk/dports/lang/llvm-3.7/files/move-clang-resources.patch
trunk/dports/lang/llvm-3.7/files/scan-build-PR-35006.patch
trunk/dports/lang/llvm-3.7/files/skip-python-check.patch
trunk/dports/lang/llvm-3.7/files/snowleopard-cmath.patch
Modified: trunk/dports/lang/llvm-3.6/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.6/Portfile 2015-01-17 23:47:53 UTC (rev 131761)
+++ trunk/dports/lang/llvm-3.6/Portfile 2015-01-18 02:19:23 UTC (rev 131762)
@@ -93,29 +93,31 @@
}
}
-patchfiles install_target.patch \
- fix-dylib-ids.patch
-
patch.pre_args -p1
+patchfiles \
+ 0001-Set-the-Mach-O-CPU-Subtype-to-ppc7400-when-targeting.patch \
+ 0002-MacPorts-Only-Update-install-targets-for-clang-subpo.patch \
+ 0003-MacPorts-Only-Use-full-path-for-the-dylib-id-instead.patch \
+ 0004-MacPorts-Only-Don-t-embed-the-deployment-target-in-t.patch \
+ 0005-MacPorts-Only-Skip-checking-for-python-in-configure.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 scan-build-PR-35006.patch \
- 0001-Comment-out-SL-cctools-workaround.patch \
- 0001-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch \
- 0003-Fix-local-and-iterator-when-building-with-Lion-and-n.patch \
- 0004-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch \
- llvm-integrated-as.patch \
- clang-format.patch \
- clang-modernize.patch \
- snowleopard-cmath.patch \
- move-clang-resources.patch \
- fix-libclang_rt-dylib-ids.patch \
- lion-xcrun-fallback.patch
+if {${subport} eq "clang-${llvm_version}"} {
+ patchfiles-append \
+ 1001-Default-to-ppc7400-for-OSX-10.5.patch \
+ 1002-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch \
+ 1003-MacPorts-Only-Fall-back-on-xcodebuild-sdk-when-xcrun.patch \
+ 1004-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch \
+ 1005-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch \
+ 1006-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch \
+ 2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch \
+ 2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch \
+ 2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch \
+ 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
+
if {![variant_isset arm_runtime]} {
# Alternate fix for #33272.
patchfiles-append disable-arm-runtime.patch
@@ -209,7 +211,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
}
}
Modified: trunk/dports/lang/llvm-3.6/files/0001-Comment-out-SL-cctools-workaround.patch
===================================================================
--- trunk/dports/lang/llvm-3.6/files/0001-Comment-out-SL-cctools-workaround.patch 2015-01-17 23:47:53 UTC (rev 131761)
+++ trunk/dports/lang/llvm-3.6/files/0001-Comment-out-SL-cctools-workaround.patch 2015-01-18 02:19:23 UTC (rev 131762)
@@ -1,61 +0,0 @@
-Index: llvm-3.6svn/projects/compiler-rt/make/platform/clang_darwin.mk
-===================================================================
---- llvm-3.6svn.orig/projects/compiler-rt/make/platform/clang_darwin.mk
-+++ llvm-3.6svn/projects/compiler-rt/make/platform/clang_darwin.mk
-@@ -53,11 +53,11 @@ XCRunSdkPath = \
-
- CC := $(call XCRun,clang)
- LD := $(shell $(CC) -print-prog-name=ld)
--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
-
- OSX_SDK := $(call XCRunSdkPath,macosx)
- IOS_SDK := $(call XCRunSdkPath,iphoneos)
-@@ -122,12 +122,12 @@ UniversalArchs.ubsan_osx := $(call Check
- # object files. If we are on that platform, strip out all ARM archs. We still
- # build the libraries themselves so that Clang can find them where it expects
- # them, even though they might not have an expected slice.
--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.6svn/projects/compiler-rt/make/platform/clang_macho_embedded.mk
-===================================================================
---- llvm-3.6svn.orig/projects/compiler-rt/make/platform/clang_macho_embedded.mk
-+++ llvm-3.6svn/projects/compiler-rt/make/platform/clang_macho_embedded.mk
-@@ -33,11 +33,11 @@ XCRun = \
- ###
-
- 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.6/files/0001-Leopard-Default-to-fno-blocks.patch
===================================================================
--- trunk/dports/lang/llvm-3.6/files/0001-Leopard-Default-to-fno-blocks.patch 2015-01-17 23:47:53 UTC (rev 131761)
+++ trunk/dports/lang/llvm-3.6/files/0001-Leopard-Default-to-fno-blocks.patch 2015-01-18 02:19:23 UTC (rev 131762)
@@ -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/Block.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.6/files/0001-Set-the-Mach-O-CPU-Subtype-to-ppc7400-when-targeting.patch
===================================================================
--- trunk/dports/lang/llvm-3.6/files/0001-Set-the-Mach-O-CPU-Subtype-to-ppc7400-when-targeting.patch (rev 0)
+++ trunk/dports/lang/llvm-3.6/files/0001-Set-the-Mach-O-CPU-Subtype-to-ppc7400-when-targeting.patch 2015-01-18 02:19:23 UTC (rev 131762)
@@ -0,0 +1,57 @@
+From 53f17b9930d8ace72f8a8f241bc54ce65e29ecd0 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 1/5] 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>
+---
+ lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp | 14 +++++++++++---
+ 1 file changed, 11 insertions(+), 3 deletions(-)
+
+diff --git llvm_origin_master/lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp llvm_macports_master/lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp
+index bea88a2..a049c2a 100644
+--- llvm_origin_master/lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp
++++ llvm_macports_master/lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp
+@@ -205,16 +205,23 @@ public:
+ // FIXME: This should be in a separate file.
+ namespace {
+ class DarwinPPCAsmBackend : public PPCAsmBackend {
++ Triple TheTriple;
+ public:
+- DarwinPPCAsmBackend(const Target &T) : PPCAsmBackend(T, false) { }
++ DarwinPPCAsmBackend(const Target &T, StringRef TT) : PPCAsmBackend(T, false), TheTriple(TT) { }
+
+ MCObjectWriter *createObjectWriter(raw_ostream &OS) const override {
+ 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);
+ }
+ };
+
+@@ -236,8 +243,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());
+ bool IsLittleEndian = Triple(TT).getArch() == Triple::ppc64le;
+--
+2.2.2
+
Modified: trunk/dports/lang/llvm-3.6/files/0001-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch
===================================================================
--- trunk/dports/lang/llvm-3.6/files/0001-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch 2015-01-17 23:47:53 UTC (rev 131761)
+++ trunk/dports/lang/llvm-3.6/files/0001-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch 2015-01-18 02:19:23 UTC (rev 131762)
@@ -1,31 +0,0 @@
-From c6dc32fab57dc55f266c6a7dbc0b4ccbf84f75f7 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
-Date: Sat, 10 Jan 2015 03:34:51 -0800
-Subject: [PATCH] Update CheckArches to fallback on Intel/ppc if ld -v doesn't
- report supported architectures
-
-Older versions of ld64 (eg: Xcode 3.x) do not report this.
-
-http://www.llvm.org/bugs/show_bug.cgi?id=22182
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
----
- make/platform/clang_darwin.mk | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/make/platform/clang_darwin.mk b/make/platform/clang_darwin.mk
-index 6f62170..0120547 100644
---- a/projects/compiler-rt/make/platform/clang_darwin.mk
-+++ b/projects/compiler-rt/make/platform/clang_darwin.mk
-@@ -25,6 +25,8 @@ CheckArches = \
- if $(LD) -v 2>&1 | grep "configured to support" \
- | tr ' ' '\n' | grep "^$$arch$$" >/dev/null 2>/dev/null; then \
- result="$$result$$arch "; \
-+ elif ! ( $(LD) -v 2>&1 | grep "configured to support" ) && test "$$arch" = "i386" -o "$$arch" = "x86_64" -o "$$arch" = "ppc" -o "$$arch" = "ppc64" ; then \
-+ result="$$result$$arch "; \
- else \
- printf 1>&2 \
- "warning: clang_darwin.mk: dropping arch '$$arch' from lib '$(2)'";\
---
-2.2.1
-
Added: trunk/dports/lang/llvm-3.6/files/0002-MacPorts-Only-Update-install-targets-for-clang-subpo.patch
===================================================================
--- trunk/dports/lang/llvm-3.6/files/0002-MacPorts-Only-Update-install-targets-for-clang-subpo.patch (rev 0)
+++ trunk/dports/lang/llvm-3.6/files/0002-MacPorts-Only-Update-install-targets-for-clang-subpo.patch 2015-01-18 02:19:23 UTC (rev 131762)
@@ -0,0 +1,31 @@
+From b514fa09a560de0b3241c6af0d134bae09a6aec3 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 2/5] MacPorts Only: Update install targets for clang subport
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ Makefile | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git llvm_origin_master/Makefile llvm_macports_master/Makefile
+index 2b9468a..19fbfdc 100644
+--- llvm_origin_master/Makefile
++++ llvm_macports_master/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
+
Modified: trunk/dports/lang/llvm-3.6/files/0003-Fix-local-and-iterator-when-building-with-Lion-and-n.patch
===================================================================
--- trunk/dports/lang/llvm-3.6/files/0003-Fix-local-and-iterator-when-building-with-Lion-and-n.patch 2015-01-17 23:47:53 UTC (rev 131761)
+++ trunk/dports/lang/llvm-3.6/files/0003-Fix-local-and-iterator-when-building-with-Lion-and-n.patch 2015-01-18 02:19:23 UTC (rev 131762)
@@ -1,46 +0,0 @@
-From 5d209f3a5e92a27b5334b77ace93d7bb66aaef80 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 3/4] 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 e8d7616436baea0e0ff1dd78bd8d8dfc5d367e44)
----
- include/iterator | 4 ++--
- include/locale | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/include/iterator b/include/iterator
-index bcf142a..0b90d96 100644
---- a/projects/libcxx/include/iterator
-+++ b/projects/libcxx/include/iterator
-@@ -920,8 +920,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 a/include/locale b/include/locale
-index 0d01002..789b083 100644
---- a/projects/libcxx/include/locale
-+++ b/projects/libcxx/include/locale
-@@ -1473,8 +1473,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.6/files/0003-MacPorts-Only-Use-full-path-for-the-dylib-id-instead.patch
===================================================================
--- trunk/dports/lang/llvm-3.6/files/0003-MacPorts-Only-Use-full-path-for-the-dylib-id-instead.patch (rev 0)
+++ trunk/dports/lang/llvm-3.6/files/0003-MacPorts-Only-Use-full-path-for-the-dylib-id-instead.patch 2015-01-18 02:19:23 UTC (rev 131762)
@@ -0,0 +1,32 @@
+From 101281fb51d2ce628839134eeedb9533d4506192 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Sat, 17 Jan 2015 16:34:41 -0800
+Subject: [PATCH 3/5] MacPorts Only: Use full path for the dylib id instead of
+ @rpath
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ Makefile.rules | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git llvm_origin_master/Makefile.rules llvm_macports_master/Makefile.rules
+index c8c971f..78b9c51 100644
+--- llvm_origin_master/Makefile.rules
++++ llvm_macports_master/Makefile.rules
+@@ -598,7 +598,12 @@ ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW))
+ ifneq ($(HOST_OS),Darwin)
+ LD.Flags += $(RPATH) -Wl,'$$ORIGIN'
+ else
+- LD.Flags += -Wl,-install_name -Wl,"@rpath/lib$(LIBRARYNAME)$(SHLIBEXT)"
++ LD.Flags += -Wl,-install_name
++ ifdef LOADABLE_MODULE
++ LD.Flags += -Wl,"$(PROJ_libdir)/$(LIBRARYNAME)$(SHLIBEXT)"
++ else
++ LD.Flags += -Wl,"$(PROJ_libdir)/$(SharedPrefix)$(LIBRARYNAME)$(SHLIBEXT)"
++ endif
+ endif
+ endif
+ endif
+--
+2.2.2
+
Added: trunk/dports/lang/llvm-3.6/files/0004-MacPorts-Only-Don-t-embed-the-deployment-target-in-t.patch
===================================================================
--- trunk/dports/lang/llvm-3.6/files/0004-MacPorts-Only-Don-t-embed-the-deployment-target-in-t.patch (rev 0)
+++ trunk/dports/lang/llvm-3.6/files/0004-MacPorts-Only-Don-t-embed-the-deployment-target-in-t.patch 2015-01-18 02:19:23 UTC (rev 131762)
@@ -0,0 +1,29 @@
+From ff5040cbee319c918097b40312ca3c9d6ba5f19a Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Sat, 17 Jan 2015 16:41:30 -0800
+Subject: [PATCH 4/5] MacPorts Only: Don't embed the deployment target in the
+ asm when using -fno-integrated-as
+
+http://llvm.org/bugs/show_bug.cgi?id=21636
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ lib/CodeGen/AsmPrinter/AsmPrinter.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git llvm_origin_master/lib/CodeGen/AsmPrinter/AsmPrinter.cpp llvm_macports_master/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
+index bbed808..1de5715 100644
+--- llvm_origin_master/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
++++ llvm_macports_master/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
+@@ -186,7 +186,7 @@ bool AsmPrinter::doInitialization(Module &M) {
+ // use the directive, where it would need the same conditionalization
+ // anyway.
+ Triple TT(getTargetTriple());
+- if (TT.isOSDarwin()) {
++ if (TT.isOSDarwin() && MAI->useIntegratedAssembler()) {
+ unsigned Major, Minor, Update;
+ TT.getOSVersion(Major, Minor, Update);
+ // If there is a version specified, Major will be non-zero.
+--
+2.2.2
+
Modified: trunk/dports/lang/llvm-3.6/files/0004-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch
===================================================================
--- trunk/dports/lang/llvm-3.6/files/0004-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch 2015-01-17 23:47:53 UTC (rev 131761)
+++ trunk/dports/lang/llvm-3.6/files/0004-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch 2015-01-18 02:19:23 UTC (rev 131762)
@@ -1,318 +0,0 @@
-From 9f0fbe0ed8c421311713b2df58a6b6a121fa88b7 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 4/4] implement atomic<> using mutex/lock_guard for 64b ops on
- 32b PPC not pretty, not fast, but passes atomic tests
-
-(cherry picked from commit 8ec078a3bf34383cf8a0cbc6294ddf0da6bc3bed)
----
- include/__atomic_locked | 240 ++++++++++++++++++++++++++++++++++++++++++++++++
- include/atomic | 45 +++++++++
- 2 files changed, 285 insertions(+)
- create mode 100644 include/__atomic_locked
-
-diff --git a/include/__atomic_locked b/include/__atomic_locked
-new file mode 100644
-index 0000000..f10dd74
---- /dev/null
-+++ b/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 a/include/atomic b/include/atomic
-index 0427a91..7710cd1 100644
---- a/projects/libcxx/include/atomic
-+++ b/projects/libcxx/include/atomic
-@@ -1793,6 +1793,51 @@ 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_HAS_NO_THREADS
-
- #endif // _LIBCPP_ATOMIC
---
-2.2.2
-
Added: trunk/dports/lang/llvm-3.6/files/0005-MacPorts-Only-Skip-checking-for-python-in-configure.patch
===================================================================
--- trunk/dports/lang/llvm-3.6/files/0005-MacPorts-Only-Skip-checking-for-python-in-configure.patch (rev 0)
+++ trunk/dports/lang/llvm-3.6/files/0005-MacPorts-Only-Skip-checking-for-python-in-configure.patch 2015-01-18 02:19:23 UTC (rev 131762)
@@ -0,0 +1,111 @@
+From cf8cce2b5201c8113a73bb2c0c5e5f6a2d9085b8 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 5/5] MacPorts Only: Skip checking for python in configure
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ configure | 87 ---------------------------------------------------------------
+ 1 file changed, 87 deletions(-)
+
+diff --git llvm_origin_master/configure llvm_macports_master/configure
+index e72c11d..eeedeb7 100755
+--- llvm_origin_master/configure
++++ llvm_macports_master/configure
+@@ -8142,93 +8142,6 @@ CXXFLAGS="$llvm_cv_old_cxxflags"
+ echo "${ECHO_T}$NO_VARIADIC_MACROS $NO_MISSING_FIELD_INITIALIZERS $COVERED_SWITCH_DEFAULT $NO_UNINITIALIZED $NO_MAYBE_UNINITIALIZED $NO_COMMENT" >&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 python27", so it can be a program name with args.
+-set dummy python python2 python27; 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.7 or higher" >&5
+-echo "$as_me: error: could not find python 2.7 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.7" >&5
+-echo $ECHO_N "checking for python >= 2.7... $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 "7") ; 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.7
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: found python $ac_python_version ($PYTHON); required >= 2.7
+-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.6/files/1001-Default-to-ppc7400-for-OSX-10.5.patch
===================================================================
--- trunk/dports/lang/llvm-3.6/files/1001-Default-to-ppc7400-for-OSX-10.5.patch (rev 0)
+++ trunk/dports/lang/llvm-3.6/files/1001-Default-to-ppc7400-for-OSX-10.5.patch 2015-01-18 02:19:23 UTC (rev 131762)
@@ -0,0 +1,26 @@
+From 971aa68baad8c240f1abf30e62bd947a8923e3fa 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 1001/1006] Default to ppc7400 for OSX 10.5+
+
+---
+ lib/Driver/Tools.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git llvm_master/tools/clang/lib/Driver/Tools.cpp macports_master/tools/clang/lib/Driver/Tools.cpp
+index db43fde..46956e7 100644
+--- llvm_master/tools/clang/lib/Driver/Tools.cpp
++++ macports_master/tools/clang/lib/Driver/Tools.cpp
+@@ -1499,6 +1499,9 @@ static std::string getCPUName(const ArgList &Args, const llvm::Triple &T) {
+ TargetCPUName = "ppc64";
+ else if (T.getArch() == llvm::Triple::ppc64le)
+ TargetCPUName = "ppc64le";
++ else if (T.isOSDarwin() && !T.isMacOSXVersionLT(10,5))
++ // For 10.5+ Altivec is assumed available.
++ TargetCPUName = "7400";
+ else
+ TargetCPUName = "ppc";
+ }
+--
+2.2.2
+
Added: trunk/dports/lang/llvm-3.6/files/1002-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch
===================================================================
--- trunk/dports/lang/llvm-3.6/files/1002-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch (rev 0)
+++ trunk/dports/lang/llvm-3.6/files/1002-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch 2015-01-18 02:19:23 UTC (rev 131762)
@@ -0,0 +1,84 @@
+From d95bdf342037ee815fa21e871dd9479bc3572550 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 1002/1006] MacPorts Only: Prepare clang-format for replacement
+ with absolute path
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ 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 | 3 +--
+ tools/clang-format/clang-format.py | 2 +-
+ 5 files changed, 5 insertions(+), 6 deletions(-)
+
+diff --git llvm_master/tools/clang/tools/clang-format/clang-format-bbedit.applescript macports_master/tools/clang/tools/clang-format/clang-format-bbedit.applescript
+index fa88fe9..eb09448 100644
+--- llvm_master/tools/clang/tools/clang-format/clang-format-bbedit.applescript
++++ macports_master/tools/clang/tools/clang-format/clang-format-bbedit.applescript
+@@ -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_master/tools/clang/tools/clang-format/clang-format-diff.py macports_master/tools/clang/tools/clang-format/clang-format-diff.py
+index 23adb07..063c5d2 100755
+--- llvm_master/tools/clang/tools/clang-format/clang-format-diff.py
++++ macports_master/tools/clang/tools/clang-format/clang-format-diff.py
+@@ -32,7 +32,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_master/tools/clang/tools/clang-format/clang-format-sublime.py macports_master/tools/clang/tools/clang-format/clang-format-sublime.py
+index 16ff56e..4b68104 100644
+--- llvm_master/tools/clang/tools/clang-format/clang-format-sublime.py
++++ macports_master/tools/clang/tools/clang-format/clang-format-sublime.py
+@@ -18,7 +18,7 @@ import sublime_plugin
+ 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_master/tools/clang/tools/clang-format/clang-format.el macports_master/tools/clang/tools/clang-format/clang-format.el
+index ab0991b..a2a278a 100644
+--- llvm_master/tools/clang/tools/clang-format/clang-format.el
++++ macports_master/tools/clang/tools/clang-format/clang-format.el
+@@ -36,8 +36,7 @@
+ :group 'tools)
+
+ (defcustom clang-format-executable
+- (or (executable-find "clang-format")
+- "clang-format")
++ "@CLANG_FORMAT_PATH@"
+ "Location of the clang-format executable.
+
+ A string containing the name or the full path of the executable."
+diff --git llvm_master/tools/clang/tools/clang-format/clang-format.py macports_master/tools/clang/tools/clang-format/clang-format.py
+index a79205a..e71362a 100644
+--- llvm_master/tools/clang/tools/clang-format/clang-format.py
++++ macports_master/tools/clang/tools/clang-format/clang-format.py
+@@ -25,7 +25,7 @@ import vim
+
+ # set g:clang_format_path to the path to clang-format if it is not on the path
+ # Change this to the full path if clang-format is not on the path.
+-binary = 'clang-format'
++binary = '@CLANG_FORMAT_PATH@'
+ if vim.eval('exists("g:clang_format_path")') == "1":
+ binary = vim.eval('g:clang_format_path')
+
+--
+2.2.2
+
Added: trunk/dports/lang/llvm-3.6/files/1003-MacPorts-Only-Fall-back-on-xcodebuild-sdk-when-xcrun.patch
===================================================================
--- trunk/dports/lang/llvm-3.6/files/1003-MacPorts-Only-Fall-back-on-xcodebuild-sdk-when-xcrun.patch (rev 0)
+++ trunk/dports/lang/llvm-3.6/files/1003-MacPorts-Only-Fall-back-on-xcodebuild-sdk-when-xcrun.patch 2015-01-18 02:19:23 UTC (rev 131762)
@@ -0,0 +1,39 @@
+From c69389a9ad48948076d754f99b94fbf797ea01fd Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Sat, 17 Jan 2015 17:51:10 -0800
+Subject: [PATCH 1003/1006] MacPorts Only: Fall back on xcodebuild -sdk when
+ xcrun --sdk is not supported
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ runtime/compiler-rt/Makefile | 14 ++++++++++++--
+ 1 file changed, 12 insertions(+), 2 deletions(-)
+
+diff --git llvm_master/tools/clang/runtime/compiler-rt/Makefile macports_master/tools/clang/runtime/compiler-rt/Makefile
+index f06ef99..b0946ba 100644
+--- llvm_master/tools/clang/runtime/compiler-rt/Makefile
++++ macports_master/tools/clang/runtime/compiler-rt/Makefile
+@@ -81,8 +81,18 @@ RuntimeLibrary.darwin.Configs := \
+ profile_osx.a \
+ ubsan_osx.a
+
+-IOS_SDK := $(shell xcrun --show-sdk-path -sdk iphoneos 2> /dev/null)
+-IOSSIM_SDK := $(shell xcrun --show-sdk-path -sdk iphonesimulator 2> /dev/null)
++XCRunSdkPath = \
++ $(shell \
++ result=`xcrun --sdk $(1) --show-sdk-path 2> /dev/null`; \
++ if [ "$$?" != "0" ]; then \
++ result=`xcodebuild -sdk $(1) -version 2> /dev/null \
++ | sed -n 's/^Path: \(..*\)$$/\1/p'`; \
++ fi; \
++ if [ "$$?" != "0" ]; then result=""; fi; \
++ echo $$result)
++
++IOS_SDK := $(call XCRunSdkPath,iphoneos)
++IOSSIM_SDK := $(call XCRunSdkPath,iphonesimulator)
+
+ ifneq ($(IOS_SDK)$(IOSSIM_SDK),)
+ RuntimeLibrary.darwin.Configs += ios.a profile_ios.a
+--
+2.2.2
+
Added: trunk/dports/lang/llvm-3.6/files/1004-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch
===================================================================
--- trunk/dports/lang/llvm-3.6/files/1004-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch (rev 0)
+++ trunk/dports/lang/llvm-3.6/files/1004-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch 2015-01-18 02:19:23 UTC (rev 131762)
@@ -0,0 +1,29 @@
+From cf37a2cc4435f757228e928f5fbfb6cadd1b2e21 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 1004/1006] 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>
+---
+ tools/scan-build/scan-build | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git llvm_master/tools/clang/tools/scan-build/scan-build macports_master/tools/clang/tools/scan-build/scan-build
+index d52d8f5..2a3d1db 100755
+--- llvm_master/tools/clang/tools/scan-build/scan-build
++++ macports_master/tools/clang/tools/scan-build/scan-build
+@@ -1728,6 +1728,8 @@ if (defined $OutputFormat) {
+ 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.6/files/1005-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch
===================================================================
--- trunk/dports/lang/llvm-3.6/files/1005-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch (rev 0)
+++ trunk/dports/lang/llvm-3.6/files/1005-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch 2015-01-18 02:19:23 UTC (rev 131762)
@@ -0,0 +1,27 @@
+From 1e79aa1d2d652fe79c244c185eeff76c2e40caf2 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 1005/1006] MacPorts Only: Fix libclang_rt dylib ids
+
+We should probably not be shipping these.
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ runtime/compiler-rt/Makefile | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git llvm_master/tools/clang/runtime/compiler-rt/Makefile macports_master/tools/clang/runtime/compiler-rt/Makefile
+index b0946ba..5549038 100644
+--- llvm_master/tools/clang/runtime/compiler-rt/Makefile
++++ macports_master/tools/clang/runtime/compiler-rt/Makefile
+@@ -244,6 +244,7 @@ $(PROJ_resources_lib)/$1/libclang_rt.%.dylib: \
+ $(ResourceLibDir)/$1/libclang_rt.%.dylib | $(PROJ_resources_lib)/$1
+ $(Echo) Installing compiler runtime library: $1/$$*
+ $(Verb) $(DataInstall) $$< $(PROJ_resources_lib)/$1
++ $(Verb) install_name_tool $$@ -id $$(patsubst $(DESTDIR)%,%,$$@)
+
+ # Rule to install runtime libraries.
+ RuntimeLibraryInstall.$1: \
+--
+2.2.2
+
Added: trunk/dports/lang/llvm-3.6/files/1006-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch
===================================================================
--- trunk/dports/lang/llvm-3.6/files/1006-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch (rev 0)
+++ trunk/dports/lang/llvm-3.6/files/1006-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch 2015-01-18 02:19:23 UTC (rev 131762)
@@ -0,0 +1,74 @@
+From 0111fcf6f32dfeb41ae0b1e9be0258b899d97200 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 1006/1006] MacPorts Only: Relocate clang resources using llvm
+ version
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ lib/Headers/Makefile | 3 ++-
+ runtime/compiler-rt/Makefile | 15 ++++++++++++++-
+ 2 files changed, 16 insertions(+), 2 deletions(-)
+
+diff --git llvm_master/tools/clang/lib/Headers/Makefile macports_master/tools/clang/lib/Headers/Makefile
+index 903acac..7c37992 100644
+--- llvm_master/tools/clang/lib/Headers/Makefile
++++ macports_master/tools/clang/lib/Headers/Makefile
+@@ -16,6 +16,7 @@ include $(CLANG_LEVEL)/Makefile
+
+ CLANG_VERSION := $(word 3,$(shell grep "CLANG_VERSION " \
+ $(PROJ_OBJ_DIR)/$(CLANG_LEVEL)/include/clang/Basic/Version.inc))
++LLVM_VERSION := $(LLVM_VERSION_MAJOR).$(LLVM_VERSION_MINOR)
+
+ HeaderDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/lib/clang/$(CLANG_VERSION)/include
+
+@@ -40,7 +41,7 @@ $(HeaderDir)/module.modulemap: $(PROJ_SRC_DIR)/module.modulemap $(HeaderDir)/.di
+ # Hook into the standard Makefile rules.
+ all-local:: $(OBJHEADERS) $(HeaderDir)/module.modulemap
+
+-PROJ_headers := $(DESTDIR)$(PROJ_prefix)/lib/clang/$(CLANG_VERSION)/include
++PROJ_headers := $(DESTDIR)$(PROJ_prefix)/lib/clang/$(LLVM_VERSION)/include
+
+ INSTHEADERS := $(addprefix $(PROJ_headers)/, $(HEADERS))
+ INSTHEADERS += $(PROJ_headers)/arm_neon.h
+diff --git llvm_master/tools/clang/runtime/compiler-rt/Makefile macports_master/tools/clang/runtime/compiler-rt/Makefile
+index 5549038..50f0a81 100644
+--- llvm_master/tools/clang/runtime/compiler-rt/Makefile
++++ macports_master/tools/clang/runtime/compiler-rt/Makefile
+@@ -18,9 +18,10 @@ include $(CLANG_LEVEL)/Makefile
+
+ CLANG_VERSION := $(word 3,$(shell grep "CLANG_VERSION " \
+ $(PROJ_OBJ_DIR)/$(CLANG_LEVEL)/include/clang/Basic/Version.inc))
++LLVM_VERSION := $(LLVM_VERSION_MAJOR).$(LLVM_VERSION_MINOR)
+
+ ResourceDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/lib/clang/$(CLANG_VERSION)
+-PROJ_resources := $(DESTDIR)$(PROJ_prefix)/lib/clang/$(CLANG_VERSION)
++PROJ_resources := $(DESTDIR)$(PROJ_prefix)/lib/clang/$(LLVM_VERSION)
+
+ ResourceLibDir := $(ResourceDir)/lib
+ ResourceIncludeDir := $(ResourceDir)/include
+@@ -265,9 +266,21 @@ $(PROJ_resources_include)/sanitizer: $(ResourceIncludeDir)/sanitizer $(PROJ_reso
+ RuntimeHeaderInstall: $(PROJ_resources_include)/sanitizer
+ .PHONY: RuntimeHeaderInstall
+
++# Make sure $(PROJ_resources) exists before creating the symlink.
++$(PROJ_resources:$(LLVM_VERSION)=$(CLANG_VERSION)):
++ $(Echo) Creating compiler runtime compatibility symlink
++ $(Verb) $(MKDIR) $(dir $@)
++ $(Verb) ln -s $(LLVM_VERSION) $@
++
++MacPortsClangResSymlinkInstall: $(PROJ_resources:$(LLVM_VERSION)=$(CLANG_VERSION))
++.PHONY: MacPortsClangResSymlinkInstall
++
+ # Hook into the standard Makefile rules.
+ all-local:: $(RuntimeDirs:%=RuntimeLibrary.%) RuntimeHeader
+ install-local:: $(RuntimeDirs:%=RuntimeLibraryInstall.%) RuntimeHeaderInstall
++ifneq ($(LLVM_VERSION),$(CLANG_VERSION))
++install-local:: MacPortsClangResSymlinkInstall
++endif
+ clean-local:: CleanRuntimeLibraries
+
+ endif
+--
+2.2.2
+
Added: trunk/dports/lang/llvm-3.6/files/2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch
===================================================================
--- trunk/dports/lang/llvm-3.6/files/2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch (rev 0)
+++ trunk/dports/lang/llvm-3.6/files/2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch 2015-01-18 02:19:23 UTC (rev 131762)
@@ -0,0 +1,36 @@
+From 2972ffafff4a394f521986b47810324cd1b7e3ba 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/2003] MacPorts Only: Comment out SL cctools workaround
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ make/platform/clang_darwin.mk | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk macports_master/projects/compiler-rt/make/platform/clang_darwin.mk
+index f4f548e..6f62170 100644
+--- llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk
++++ macports_master/projects/compiler-rt/make/platform/clang_darwin.mk
+@@ -122,12 +122,12 @@ UniversalArchs.ubsan_osx := $(call CheckArches,i386 x86_64 x86_64h,ubsan_osx,$(O
+ # 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.6/files/2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch
===================================================================
--- trunk/dports/lang/llvm-3.6/files/2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch (rev 0)
+++ trunk/dports/lang/llvm-3.6/files/2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch 2015-01-18 02:19:23 UTC (rev 131762)
@@ -0,0 +1,31 @@
+From b16ca706de5eeb244b1fe889760ae4339b23a170 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Sat, 10 Jan 2015 03:34:51 -0800
+Subject: [PATCH 2002/2003] Update CheckArches to fallback on Intel/ppc if ld
+ -v doesn't report supported architectures
+
+Older versions of ld64 (eg: Xcode 3.x) do not report this.
+
+http://www.llvm.org/bugs/show_bug.cgi?id=22182
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ make/platform/clang_darwin.mk | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk macports_master/projects/compiler-rt/make/platform/clang_darwin.mk
+index 6f62170..0120547 100644
+--- llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk
++++ macports_master/projects/compiler-rt/make/platform/clang_darwin.mk
+@@ -25,6 +25,8 @@ CheckArches = \
+ if $(LD) -v 2>&1 | grep "configured to support" \
+ | tr ' ' '\n' | grep "^$$arch$$" >/dev/null 2>/dev/null; then \
+ result="$$result$$arch "; \
++ elif ! ( $(LD) -v 2>&1 | grep "configured to support" ) && test "$$arch" = "i386" -o "$$arch" = "x86_64" -o "$$arch" = "ppc" -o "$$arch" = "ppc64" ; then \
++ result="$$result$$arch "; \
+ else \
+ printf 1>&2 \
+ "warning: clang_darwin.mk: dropping arch '$$arch' from lib '$(2)'";\
+--
+2.2.2
+
Added: trunk/dports/lang/llvm-3.6/files/2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch
===================================================================
--- trunk/dports/lang/llvm-3.6/files/2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch (rev 0)
+++ trunk/dports/lang/llvm-3.6/files/2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch 2015-01-18 02:19:23 UTC (rev 131762)
@@ -0,0 +1,29 @@
+From e1ded9c3e06fb5c97d8936b77ccf8982e52a7b69 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Sat, 17 Jan 2015 17:45:27 -0800
+Subject: [PATCH 2003/2003] Fall back on xcodebuild -sdk when xcrun --sdk is
+ not supported
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ make/platform/clang_darwin.mk | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk macports_master/projects/compiler-rt/make/platform/clang_darwin.mk
+index 0120547..ac8de4a 100644
+--- llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk
++++ macports_master/projects/compiler-rt/make/platform/clang_darwin.mk
+@@ -49,6 +49,10 @@ XCRun = \
+ XCRunSdkPath = \
+ $(shell \
+ result=`xcrun --sdk $(1) --show-sdk-path 2> /dev/null`; \
++ if [ "$$?" != "0" ]; then \
++ result=`xcodebuild -sdk $(1) -version 2> /dev/null \
++ | sed -n 's/^Path: \(..*\)$$/\1/p'`; \
++ fi; \
+ if [ "$$?" != "0" ]; then result=""; fi; \
+ echo $$result)
+ ###
+--
+2.2.2
+
Added: trunk/dports/lang/llvm-3.6/files/3001-buildit-build-fix-for-Leopard.patch
===================================================================
--- trunk/dports/lang/llvm-3.6/files/3001-buildit-build-fix-for-Leopard.patch (rev 0)
+++ trunk/dports/lang/llvm-3.6/files/3001-buildit-build-fix-for-Leopard.patch 2015-01-18 02:19:23 UTC (rev 131762)
@@ -0,0 +1,35 @@
+From b46773a9b7d9867cbfc74d203cd9a444e323d1f7 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>
+---
+ lib/buildit | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git llvm_master/projects/libcxx/lib/buildit macports_master/projects/libcxx/lib/buildit
+index 7e3bc2e..2740dee 100755
+--- llvm_master/projects/libcxx/lib/buildit
++++ macports_master/projects/libcxx/lib/buildit
+@@ -50,7 +50,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 \
+@@ -59,7 +59,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.6/files/3002-buildit-Set-compatibility-version-to-RC_ProjectSourc.patch
===================================================================
--- trunk/dports/lang/llvm-3.6/files/3002-buildit-Set-compatibility-version-to-RC_ProjectSourc.patch (rev 0)
+++ trunk/dports/lang/llvm-3.6/files/3002-buildit-Set-compatibility-version-to-RC_ProjectSourc.patch 2015-01-18 02:19:23 UTC (rev 131762)
@@ -0,0 +1,28 @@
+From ce37e96b968fbcc4b6aef18b1a163d297db903b2 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>
+---
+ lib/buildit | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git llvm_master/projects/libcxx/lib/buildit macports_master/projects/libcxx/lib/buildit
+index 2740dee..c74683f 100755
+--- llvm_master/projects/libcxx/lib/buildit
++++ macports_master/projects/libcxx/lib/buildit
+@@ -54,7 +54,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.6/files/3003-Fix-local-and-iterator-when-building-with-Lion-and-n.patch
===================================================================
--- trunk/dports/lang/llvm-3.6/files/3003-Fix-local-and-iterator-when-building-with-Lion-and-n.patch (rev 0)
+++ trunk/dports/lang/llvm-3.6/files/3003-Fix-local-and-iterator-when-building-with-Lion-and-n.patch 2015-01-18 02:19:23 UTC (rev 131762)
@@ -0,0 +1,45 @@
+From cb271d6ce269bbddc916643c495ccbdfde6e3054 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>
+---
+ include/iterator | 4 ++--
+ include/locale | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git llvm_master/projects/libcxx/include/iterator macports_master/projects/libcxx/include/iterator
+index bcf142a..0b90d96 100644
+--- llvm_master/projects/libcxx/include/iterator
++++ macports_master/projects/libcxx/include/iterator
+@@ -920,8 +920,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_master/projects/libcxx/include/locale macports_master/projects/libcxx/include/locale
+index 0d01002..789b083 100644
+--- llvm_master/projects/libcxx/include/locale
++++ macports_master/projects/libcxx/include/locale
+@@ -1473,8 +1473,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.6/files/3004-Fix-missing-long-long-math-prototypes-when-using-the.patch
===================================================================
--- trunk/dports/lang/llvm-3.6/files/3004-Fix-missing-long-long-math-prototypes-when-using-the.patch (rev 0)
+++ trunk/dports/lang/llvm-3.6/files/3004-Fix-missing-long-long-math-prototypes-when-using-the.patch 2015-01-18 02:19:23 UTC (rev 131762)
@@ -0,0 +1,41 @@
+From afdc64a717d3b284f920944146952bcbbc111cd0 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>
+---
+ include/cmath | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+diff --git llvm_master/projects/libcxx/include/cmath macports_master/projects/libcxx/include/cmath
+index d3aa4be..eb91dfb 100644
+--- llvm_master/projects/libcxx/include/cmath
++++ macports_master/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.6/files/3005-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch
===================================================================
--- trunk/dports/lang/llvm-3.6/files/3005-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch (rev 0)
+++ trunk/dports/lang/llvm-3.6/files/3005-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch 2015-01-18 02:19:23 UTC (rev 131762)
@@ -0,0 +1,317 @@
+From 88eccd6a4edd5675ab6657464c004a249893c974 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
+
+---
+ include/__atomic_locked | 240 ++++++++++++++++++++++++++++++++++++++++++++++++
+ include/atomic | 45 +++++++++
+ 2 files changed, 285 insertions(+)
+ create mode 100644 include/__atomic_locked
+
+diff --git llvm_master/projects/libcxx/include/__atomic_locked macports_master/projects/libcxx/include/__atomic_locked
+new file mode 100644
+index 0000000..f10dd74
+--- /dev/null
++++ macports_master/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_master/projects/libcxx/include/atomic macports_master/projects/libcxx/include/atomic
+index 0427a91..7710cd1 100644
+--- llvm_master/projects/libcxx/include/atomic
++++ macports_master/projects/libcxx/include/atomic
+@@ -1793,6 +1793,51 @@ 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_HAS_NO_THREADS
+
+ #endif // _LIBCPP_ATOMIC
+--
+2.2.2
+
Modified: trunk/dports/lang/llvm-3.6/files/clang-format.patch
===================================================================
--- trunk/dports/lang/llvm-3.6/files/clang-format.patch 2015-01-17 23:47:53 UTC (rev 131761)
+++ trunk/dports/lang/llvm-3.6/files/clang-format.patch 2015-01-18 02:19:23 UTC (rev 131762)
@@ -1,74 +0,0 @@
-diff -Naurp trunk.orig/Makefile trunk/Makefile
---- trunk.orig/Makefile 2014-11-24 11:32:24.000000000 -0800
-+++ trunk/Makefile 2014-11-24 11:34:41.000000000 -0800
-@@ -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
-diff -Naurp trunk.orig/tools/clang/tools/clang-format/clang-format-bbedit.applescript trunk/tools/clang/tools/clang-format/clang-format-bbedit.applescript
---- trunk.orig/tools/clang/tools/clang-format/clang-format-bbedit.applescript 2014-11-24 11:31:46.000000000 -0800
-+++ trunk/tools/clang/tools/clang-format/clang-format-bbedit.applescript 2014-11-24 11:34:41.000000000 -0800
-@@ -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 -Naurp trunk.orig/tools/clang/tools/clang-format/clang-format-diff.py trunk/tools/clang/tools/clang-format/clang-format-diff.py
---- trunk.orig/tools/clang/tools/clang-format/clang-format-diff.py 2014-11-24 11:31:46.000000000 -0800
-+++ trunk/tools/clang/tools/clang-format/clang-format-diff.py 2014-11-24 11:34:41.000000000 -0800
-@@ -32,7 +32,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 -Naurp trunk.orig/tools/clang/tools/clang-format/clang-format-sublime.py trunk/tools/clang/tools/clang-format/clang-format-sublime.py
---- trunk.orig/tools/clang/tools/clang-format/clang-format-sublime.py 2014-11-24 11:31:46.000000000 -0800
-+++ trunk/tools/clang/tools/clang-format/clang-format-sublime.py 2014-11-24 11:34:41.000000000 -0800
-@@ -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 -Naurp trunk.orig/tools/clang/tools/clang-format/clang-format.el trunk/tools/clang/tools/clang-format/clang-format.el
---- trunk.orig/tools/clang/tools/clang-format/clang-format.el 2014-11-24 11:31:46.000000000 -0800
-+++ trunk/tools/clang/tools/clang-format/clang-format.el 2014-11-24 11:34:41.000000000 -0800
-@@ -36,8 +36,7 @@
- :group 'tools)
-
- (defcustom clang-format-executable
-- (or (executable-find "clang-format")
-- "clang-format")
-+ "@CLANG_FORMAT_PATH@"
- "Location of the clang-format executable.
-
- A string containing the name or the full path of the executable."
-diff -Naurp trunk.orig/tools/clang/tools/clang-format/clang-format.py trunk/tools/clang/tools/clang-format/clang-format.py
---- trunk.orig/tools/clang/tools/clang-format/clang-format.py 2014-11-24 11:31:46.000000000 -0800
-+++ trunk/tools/clang/tools/clang-format/clang-format.py 2014-11-24 11:35:39.000000000 -0800
-@@ -25,7 +25,7 @@ import vim
-
- # set g:clang_format_path to the path to clang-format if it is not on the path
- # Change this to the full path if clang-format is not on the path.
--binary = 'clang-format'
-+binary = '@CLANG_FORMAT_PATH@'
- if vim.eval('exists("g:clang_format_path")') == "1":
- binary = vim.eval('g:clang_format_path')
-
Modified: trunk/dports/lang/llvm-3.6/files/clang-modernize.patch
===================================================================
--- trunk/dports/lang/llvm-3.6/files/clang-modernize.patch 2015-01-17 23:47:53 UTC (rev 131761)
+++ trunk/dports/lang/llvm-3.6/files/clang-modernize.patch 2015-01-18 02:19:23 UTC (rev 131762)
@@ -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
Modified: trunk/dports/lang/llvm-3.6/files/fix-dylib-ids.patch
===================================================================
--- trunk/dports/lang/llvm-3.6/files/fix-dylib-ids.patch 2015-01-17 23:47:53 UTC (rev 131761)
+++ trunk/dports/lang/llvm-3.6/files/fix-dylib-ids.patch 2015-01-18 02:19:23 UTC (rev 131762)
@@ -1,18 +0,0 @@
-diff --git a/Makefile.rules b/Makefile.rules
-index c8c971f..78b9c51 100644
---- a/Makefile.rules
-+++ b/Makefile.rules
-@@ -598,7 +598,12 @@ ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW))
- ifneq ($(HOST_OS),Darwin)
- LD.Flags += $(RPATH) -Wl,'$$ORIGIN'
- else
-- LD.Flags += -Wl,-install_name -Wl,"@rpath/lib$(LIBRARYNAME)$(SHLIBEXT)"
-+ LD.Flags += -Wl,-install_name
-+ ifdef LOADABLE_MODULE
-+ LD.Flags += -Wl,"$(PROJ_libdir)/$(LIBRARYNAME)$(SHLIBEXT)"
-+ else
-+ LD.Flags += -Wl,"$(PROJ_libdir)/$(SharedPrefix)$(LIBRARYNAME)$(SHLIBEXT)"
-+ endif
- endif
- endif
- endif
Modified: trunk/dports/lang/llvm-3.6/files/fix-libclang_rt-dylib-ids.patch
===================================================================
--- trunk/dports/lang/llvm-3.6/files/fix-libclang_rt-dylib-ids.patch 2015-01-17 23:47:53 UTC (rev 131761)
+++ trunk/dports/lang/llvm-3.6/files/fix-libclang_rt-dylib-ids.patch 2015-01-18 02:19:23 UTC (rev 131762)
@@ -1,12 +0,0 @@
-Index: llvm-3.6svn/tools/clang/runtime/compiler-rt/Makefile
-===================================================================
---- llvm-3.6svn.orig/tools/clang/runtime/compiler-rt/Makefile
-+++ llvm-3.6svn/tools/clang/runtime/compiler-rt/Makefile
-@@ -235,6 +235,7 @@ $(PROJ_resources_lib)/$1/libclang_rt.%.d
- $(ResourceLibDir)/$1/libclang_rt.%.dylib | $(PROJ_resources_lib)/$1
- $(Echo) Installing compiler runtime library: $1/$$*
- $(Verb) $(DataInstall) $$< $(PROJ_resources_lib)/$1
-+ $(Verb) install_name_tool $$@ -id $$(patsubst $(DESTDIR)%,%,$$@)
-
- # Rule to install runtime libraries.
- RuntimeLibraryInstall.$1: \
Modified: trunk/dports/lang/llvm-3.6/files/install_target.patch
===================================================================
--- trunk/dports/lang/llvm-3.6/files/install_target.patch 2015-01-17 23:47:53 UTC (rev 131761)
+++ trunk/dports/lang/llvm-3.6/files/install_target.patch 2015-01-18 02:19:23 UTC (rev 131762)
@@ -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
Added: trunk/dports/lang/llvm-3.6/files/leopard-no-blocks.patch
===================================================================
--- trunk/dports/lang/llvm-3.6/files/leopard-no-blocks.patch (rev 0)
+++ trunk/dports/lang/llvm-3.6/files/leopard-no-blocks.patch 2015-01-18 02:19:23 UTC (rev 131762)
@@ -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/Block.h.
+- return true;
++ return false;
+ }
+ bool IsIntegratedAssemblerDefault() const override {
+ // Default integrated assembler to on for Apple's MachO targets.
+--
+2.2.1
+
Modified: trunk/dports/lang/llvm-3.6/files/lion-xcrun-fallback.patch
===================================================================
--- trunk/dports/lang/llvm-3.6/files/lion-xcrun-fallback.patch 2015-01-17 23:47:53 UTC (rev 131761)
+++ trunk/dports/lang/llvm-3.6/files/lion-xcrun-fallback.patch 2015-01-18 02:19:23 UTC (rev 131762)
@@ -1,40 +0,0 @@
-diff --git a/projects/compiler-rt/make/platform/clang_darwin.mk b/projects/compiler-rt/make/platform/clang_darwin.mk
-index 6ed3230..b4917c8 100644
---- a/projects/compiler-rt/make/platform/clang_darwin.mk
-+++ b/projects/compiler-rt/make/platform/clang_darwin.mk
-@@ -47,6 +47,10 @@ XCRun = \
- XCRunSdkPath = \
- $(shell \
- result=`xcrun --sdk $(1) --show-sdk-path 2> /dev/null`; \
-+ if [ "$$?" != "0" ]; then \
-+ result=`xcodebuild -sdk $(1) -version 2> /dev/null \
-+ | sed -n 's/^Path: \(..*\)$$/\1/p'`; \
-+ fi; \
- if [ "$$?" != "0" ]; then result=""; fi; \
- echo $$result)
- ###
-diff --git a/tools/clang/runtime/compiler-rt/Makefile b/tools/clang/runtime/compiler-rt/Makefile
-index 95c9fb7..50f0a81 100644
---- a/tools/clang/runtime/compiler-rt/Makefile
-+++ b/tools/clang/runtime/compiler-rt/Makefile
-@@ -82,8 +82,18 @@ RuntimeLibrary.darwin.Configs := \
- profile_osx.a \
- ubsan_osx.a
-
--IOS_SDK := $(shell xcrun --show-sdk-path -sdk iphoneos 2> /dev/null)
--IOSSIM_SDK := $(shell xcrun --show-sdk-path -sdk iphonesimulator 2> /dev/null)
-+XCRunSdkPath = \
-+ $(shell \
-+ result=`xcrun --sdk $(1) --show-sdk-path 2> /dev/null`; \
-+ if [ "$$?" != "0" ]; then \
-+ result=`xcodebuild -sdk $(1) -version 2> /dev/null \
-+ | sed -n 's/^Path: \(..*\)$$/\1/p'`; \
-+ fi; \
-+ if [ "$$?" != "0" ]; then result=""; fi; \
-+ echo $$result)
-+
-+IOS_SDK := $(call XCRunSdkPath,iphoneos)
-+IOSSIM_SDK := $(call XCRunSdkPath,iphonesimulator)
-
- ifneq ($(IOS_SDK)$(IOSSIM_SDK),)
- RuntimeLibrary.darwin.Configs += ios.a profile_ios.a
Modified: trunk/dports/lang/llvm-3.6/files/llvm-integrated-as.patch
===================================================================
--- trunk/dports/lang/llvm-3.6/files/llvm-integrated-as.patch 2015-01-17 23:47:53 UTC (rev 131761)
+++ trunk/dports/lang/llvm-3.6/files/llvm-integrated-as.patch 2015-01-18 02:19:23 UTC (rev 131762)
@@ -1,15 +0,0 @@
-http://llvm.org/bugs/show_bug.cgi?id=21636
-
-Index: lib/CodeGen/AsmPrinter/AsmPrinter.cpp
-===================================================================
---- a/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
-+++ b/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
-@@ -186,7 +186,7 @@
- // use the directive, where it would need the same conditionalization
- // anyway.
- Triple TT(getTargetTriple());
-- if (TT.isOSDarwin()) {
-+ if (TT.isOSDarwin() && MAI->useIntegratedAssembler()) {
- unsigned Major, Minor, Update;
- TT.getOSVersion(Major, Minor, Update);
- // If there is a version specified, Major will be non-zero.
Modified: trunk/dports/lang/llvm-3.6/files/move-clang-resources.patch
===================================================================
--- trunk/dports/lang/llvm-3.6/files/move-clang-resources.patch 2015-01-17 23:47:53 UTC (rev 131761)
+++ trunk/dports/lang/llvm-3.6/files/move-clang-resources.patch 2015-01-18 02:19:23 UTC (rev 131762)
@@ -1,59 +0,0 @@
-diff --git a/tools/clang/lib/Headers/Makefile b/tools/clang/lib/Headers/Makefile
-index 903acac..7c37992 100644
---- a/tools/clang/lib/Headers/Makefile
-+++ b/tools/clang/lib/Headers/Makefile
-@@ -16,6 +16,7 @@ include $(CLANG_LEVEL)/Makefile
-
- CLANG_VERSION := $(word 3,$(shell grep "CLANG_VERSION " \
- $(PROJ_OBJ_DIR)/$(CLANG_LEVEL)/include/clang/Basic/Version.inc))
-+LLVM_VERSION := $(LLVM_VERSION_MAJOR).$(LLVM_VERSION_MINOR)
-
- HeaderDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/lib/clang/$(CLANG_VERSION)/include
-
-@@ -40,7 +41,7 @@ $(HeaderDir)/module.modulemap: $(PROJ_SRC_DIR)/module.modulemap $(HeaderDir)/.di
- # Hook into the standard Makefile rules.
- all-local:: $(OBJHEADERS) $(HeaderDir)/module.modulemap
-
--PROJ_headers := $(DESTDIR)$(PROJ_prefix)/lib/clang/$(CLANG_VERSION)/include
-+PROJ_headers := $(DESTDIR)$(PROJ_prefix)/lib/clang/$(LLVM_VERSION)/include
-
- INSTHEADERS := $(addprefix $(PROJ_headers)/, $(HEADERS))
- INSTHEADERS += $(PROJ_headers)/arm_neon.h
-diff --git a/tools/clang/runtime/compiler-rt/Makefile b/tools/clang/runtime/compiler-rt/Makefile
-index f06ef99..947dd9a 100644
---- a/tools/clang/runtime/compiler-rt/Makefile
-+++ b/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
-@@ -254,9 +255,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
Modified: trunk/dports/lang/llvm-3.6/files/scan-build-PR-35006.patch
===================================================================
--- trunk/dports/lang/llvm-3.6/files/scan-build-PR-35006.patch 2015-01-17 23:47:53 UTC (rev 131761)
+++ trunk/dports/lang/llvm-3.6/files/scan-build-PR-35006.patch 2015-01-18 02:19:23 UTC (rev 131762)
@@ -1,13 +0,0 @@
-Index: llvm-3.6svn/tools/clang/tools/scan-build/scan-build
-===================================================================
---- llvm-3.6svn.orig/tools/clang/tools/scan-build/scan-build
-+++ llvm-3.6svn/tools/clang/tools/scan-build/scan-build
-@@ -1728,6 +1728,8 @@ if (defined $OutputFormat) {
- Diag "Analysis run complete.\n";
- Diag "Viewing analysis results in '$HtmlDir' using scan-view.\n";
- my $ScanView = Cwd::realpath("$RealBin/scan-view");
-+ 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";
- }
Modified: trunk/dports/lang/llvm-3.6/files/skip-python-check.patch
===================================================================
--- trunk/dports/lang/llvm-3.6/files/skip-python-check.patch 2015-01-17 23:47:53 UTC (rev 131761)
+++ trunk/dports/lang/llvm-3.6/files/skip-python-check.patch 2015-01-18 02:19:23 UTC (rev 131762)
@@ -1,98 +0,0 @@
-diff --git a/configure b/configure
-index b8cb1e2..b6ef26f 100755
---- a/configure
-+++ b/configure
-@@ -8142,93 +8142,6 @@ CXXFLAGS="$llvm_cv_old_cxxflags"
- echo "${ECHO_T}$NO_VARIADIC_MACROS $NO_MISSING_FIELD_INITIALIZERS $COVERED_SWITCH_DEFAULT $NO_UNINITIALIZED $NO_MAYBE_UNINITIALIZED $NO_COMMENT" >&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 python27", so it can be a program name with args.
--set dummy python python2 python27; 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.7 or higher" >&5
--echo "$as_me: error: could not find python 2.7 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.7" >&5
--echo $ECHO_N "checking for python >= 2.7... $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 "7") ; 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.7
--See \`config.log' for more details." >&5
--echo "$as_me: error: found python $ac_python_version ($PYTHON); required >= 2.7
--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
Modified: trunk/dports/lang/llvm-3.6/files/snowleopard-cmath.patch
===================================================================
--- trunk/dports/lang/llvm-3.6/files/snowleopard-cmath.patch 2015-01-17 23:47:53 UTC (rev 131761)
+++ trunk/dports/lang/llvm-3.6/files/snowleopard-cmath.patch 2015-01-18 02:19:23 UTC (rev 131762)
@@ -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
Modified: trunk/dports/lang/llvm-3.7/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.7/Portfile 2015-01-17 23:47:53 UTC (rev 131761)
+++ trunk/dports/lang/llvm-3.7/Portfile 2015-01-18 02:19:23 UTC (rev 131762)
@@ -94,29 +94,31 @@
}
}
-patchfiles install_target.patch \
- fix-dylib-ids.patch
-
patch.pre_args -p1
+patchfiles \
+ 0001-Set-the-Mach-O-CPU-Subtype-to-ppc7400-when-targeting.patch \
+ 0002-MacPorts-Only-Update-install-targets-for-clang-subpo.patch \
+ 0003-MacPorts-Only-Use-full-path-for-the-dylib-id-instead.patch \
+ 0004-MacPorts-Only-Don-t-embed-the-deployment-target-in-t.patch \
+ 0005-MacPorts-Only-Skip-checking-for-python-in-configure.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 scan-build-PR-35006.patch \
- 0001-Comment-out-SL-cctools-workaround.patch \
- 0001-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch \
- 0003-Fix-local-and-iterator-when-building-with-Lion-and-n.patch \
- 0004-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch \
- llvm-integrated-as.patch \
- clang-format.patch \
- clang-modernize.patch \
- snowleopard-cmath.patch \
- move-clang-resources.patch \
- fix-libclang_rt-dylib-ids.patch \
- lion-xcrun-fallback.patch
+if {${subport} eq "clang-${llvm_version}"} {
+ patchfiles-append \
+ 1001-Default-to-ppc7400-for-OSX-10.5.patch \
+ 1002-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch \
+ 1003-MacPorts-Only-Fall-back-on-xcodebuild-sdk-when-xcrun.patch \
+ 1004-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch \
+ 1005-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch \
+ 1006-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch \
+ 2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch \
+ 2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch \
+ 2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch \
+ 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
+
if {![variant_isset arm_runtime]} {
# Alternate fix for #33272.
patchfiles-append disable-arm-runtime.patch
@@ -210,7 +212,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
}
}
Deleted: trunk/dports/lang/llvm-3.7/files/0001-Comment-out-SL-cctools-workaround.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/0001-Comment-out-SL-cctools-workaround.patch 2015-01-17 23:47:53 UTC (rev 131761)
+++ trunk/dports/lang/llvm-3.7/files/0001-Comment-out-SL-cctools-workaround.patch 2015-01-18 02:19:23 UTC (rev 131762)
@@ -1,61 +0,0 @@
-Index: llvm-3.6svn/projects/compiler-rt/make/platform/clang_darwin.mk
-===================================================================
---- llvm-3.6svn.orig/projects/compiler-rt/make/platform/clang_darwin.mk
-+++ llvm-3.6svn/projects/compiler-rt/make/platform/clang_darwin.mk
-@@ -53,11 +53,11 @@ XCRunSdkPath = \
-
- CC := $(call XCRun,clang)
- LD := $(shell $(CC) -print-prog-name=ld)
--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
-
- OSX_SDK := $(call XCRunSdkPath,macosx)
- IOS_SDK := $(call XCRunSdkPath,iphoneos)
-@@ -122,12 +122,12 @@ UniversalArchs.ubsan_osx := $(call Check
- # object files. If we are on that platform, strip out all ARM archs. We still
- # build the libraries themselves so that Clang can find them where it expects
- # them, even though they might not have an expected slice.
--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.6svn/projects/compiler-rt/make/platform/clang_macho_embedded.mk
-===================================================================
---- llvm-3.6svn.orig/projects/compiler-rt/make/platform/clang_macho_embedded.mk
-+++ llvm-3.6svn/projects/compiler-rt/make/platform/clang_macho_embedded.mk
-@@ -33,11 +33,11 @@ XCRun = \
- ###
-
- 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.7/files/0001-Leopard-Default-to-fno-blocks.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/0001-Leopard-Default-to-fno-blocks.patch 2015-01-17 23:47:53 UTC (rev 131761)
+++ trunk/dports/lang/llvm-3.7/files/0001-Leopard-Default-to-fno-blocks.patch 2015-01-18 02:19:23 UTC (rev 131762)
@@ -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/Block.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.7/files/0001-Set-the-Mach-O-CPU-Subtype-to-ppc7400-when-targeting.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/0001-Set-the-Mach-O-CPU-Subtype-to-ppc7400-when-targeting.patch (rev 0)
+++ trunk/dports/lang/llvm-3.7/files/0001-Set-the-Mach-O-CPU-Subtype-to-ppc7400-when-targeting.patch 2015-01-18 02:19:23 UTC (rev 131762)
@@ -0,0 +1,57 @@
+From 53f17b9930d8ace72f8a8f241bc54ce65e29ecd0 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 1/5] 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>
+---
+ lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp | 14 +++++++++++---
+ 1 file changed, 11 insertions(+), 3 deletions(-)
+
+diff --git llvm_origin_master/lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp llvm_macports_master/lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp
+index bea88a2..a049c2a 100644
+--- llvm_origin_master/lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp
++++ llvm_macports_master/lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp
+@@ -205,16 +205,23 @@ public:
+ // FIXME: This should be in a separate file.
+ namespace {
+ class DarwinPPCAsmBackend : public PPCAsmBackend {
++ Triple TheTriple;
+ public:
+- DarwinPPCAsmBackend(const Target &T) : PPCAsmBackend(T, false) { }
++ DarwinPPCAsmBackend(const Target &T, StringRef TT) : PPCAsmBackend(T, false), TheTriple(TT) { }
+
+ MCObjectWriter *createObjectWriter(raw_ostream &OS) const override {
+ 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);
+ }
+ };
+
+@@ -236,8 +243,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());
+ bool IsLittleEndian = Triple(TT).getArch() == Triple::ppc64le;
+--
+2.2.2
+
Deleted: trunk/dports/lang/llvm-3.7/files/0001-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/0001-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch 2015-01-17 23:47:53 UTC (rev 131761)
+++ trunk/dports/lang/llvm-3.7/files/0001-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch 2015-01-18 02:19:23 UTC (rev 131762)
@@ -1,31 +0,0 @@
-From c6dc32fab57dc55f266c6a7dbc0b4ccbf84f75f7 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
-Date: Sat, 10 Jan 2015 03:34:51 -0800
-Subject: [PATCH] Update CheckArches to fallback on Intel/ppc if ld -v doesn't
- report supported architectures
-
-Older versions of ld64 (eg: Xcode 3.x) do not report this.
-
-http://www.llvm.org/bugs/show_bug.cgi?id=22182
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
----
- make/platform/clang_darwin.mk | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/make/platform/clang_darwin.mk b/make/platform/clang_darwin.mk
-index 6f62170..0120547 100644
---- a/projects/compiler-rt/make/platform/clang_darwin.mk
-+++ b/projects/compiler-rt/make/platform/clang_darwin.mk
-@@ -25,6 +25,8 @@ CheckArches = \
- if $(LD) -v 2>&1 | grep "configured to support" \
- | tr ' ' '\n' | grep "^$$arch$$" >/dev/null 2>/dev/null; then \
- result="$$result$$arch "; \
-+ elif ! ( $(LD) -v 2>&1 | grep "configured to support" ) && test "$$arch" = "i386" -o "$$arch" = "x86_64" -o "$$arch" = "ppc" -o "$$arch" = "ppc64" ; then \
-+ result="$$result$$arch "; \
- else \
- printf 1>&2 \
- "warning: clang_darwin.mk: dropping arch '$$arch' from lib '$(2)'";\
---
-2.2.1
-
Added: trunk/dports/lang/llvm-3.7/files/0002-MacPorts-Only-Update-install-targets-for-clang-subpo.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/0002-MacPorts-Only-Update-install-targets-for-clang-subpo.patch (rev 0)
+++ trunk/dports/lang/llvm-3.7/files/0002-MacPorts-Only-Update-install-targets-for-clang-subpo.patch 2015-01-18 02:19:23 UTC (rev 131762)
@@ -0,0 +1,31 @@
+From b514fa09a560de0b3241c6af0d134bae09a6aec3 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 2/5] MacPorts Only: Update install targets for clang subport
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ Makefile | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git llvm_origin_master/Makefile llvm_macports_master/Makefile
+index 2b9468a..19fbfdc 100644
+--- llvm_origin_master/Makefile
++++ llvm_macports_master/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.7/files/0003-Fix-local-and-iterator-when-building-with-Lion-and-n.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/0003-Fix-local-and-iterator-when-building-with-Lion-and-n.patch 2015-01-17 23:47:53 UTC (rev 131761)
+++ trunk/dports/lang/llvm-3.7/files/0003-Fix-local-and-iterator-when-building-with-Lion-and-n.patch 2015-01-18 02:19:23 UTC (rev 131762)
@@ -1,46 +0,0 @@
-From 5d209f3a5e92a27b5334b77ace93d7bb66aaef80 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 3/4] 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 e8d7616436baea0e0ff1dd78bd8d8dfc5d367e44)
----
- include/iterator | 4 ++--
- include/locale | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/include/iterator b/include/iterator
-index bcf142a..0b90d96 100644
---- a/projects/libcxx/include/iterator
-+++ b/projects/libcxx/include/iterator
-@@ -920,8 +920,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 a/include/locale b/include/locale
-index 0d01002..789b083 100644
---- a/projects/libcxx/include/locale
-+++ b/projects/libcxx/include/locale
-@@ -1473,8 +1473,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.7/files/0003-MacPorts-Only-Use-full-path-for-the-dylib-id-instead.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/0003-MacPorts-Only-Use-full-path-for-the-dylib-id-instead.patch (rev 0)
+++ trunk/dports/lang/llvm-3.7/files/0003-MacPorts-Only-Use-full-path-for-the-dylib-id-instead.patch 2015-01-18 02:19:23 UTC (rev 131762)
@@ -0,0 +1,32 @@
+From 101281fb51d2ce628839134eeedb9533d4506192 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Sat, 17 Jan 2015 16:34:41 -0800
+Subject: [PATCH 3/5] MacPorts Only: Use full path for the dylib id instead of
+ @rpath
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ Makefile.rules | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git llvm_origin_master/Makefile.rules llvm_macports_master/Makefile.rules
+index c8c971f..78b9c51 100644
+--- llvm_origin_master/Makefile.rules
++++ llvm_macports_master/Makefile.rules
+@@ -598,7 +598,12 @@ ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW))
+ ifneq ($(HOST_OS),Darwin)
+ LD.Flags += $(RPATH) -Wl,'$$ORIGIN'
+ else
+- LD.Flags += -Wl,-install_name -Wl,"@rpath/lib$(LIBRARYNAME)$(SHLIBEXT)"
++ LD.Flags += -Wl,-install_name
++ ifdef LOADABLE_MODULE
++ LD.Flags += -Wl,"$(PROJ_libdir)/$(LIBRARYNAME)$(SHLIBEXT)"
++ else
++ LD.Flags += -Wl,"$(PROJ_libdir)/$(SharedPrefix)$(LIBRARYNAME)$(SHLIBEXT)"
++ endif
+ endif
+ endif
+ endif
+--
+2.2.2
+
Added: trunk/dports/lang/llvm-3.7/files/0004-MacPorts-Only-Don-t-embed-the-deployment-target-in-t.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/0004-MacPorts-Only-Don-t-embed-the-deployment-target-in-t.patch (rev 0)
+++ trunk/dports/lang/llvm-3.7/files/0004-MacPorts-Only-Don-t-embed-the-deployment-target-in-t.patch 2015-01-18 02:19:23 UTC (rev 131762)
@@ -0,0 +1,29 @@
+From ff5040cbee319c918097b40312ca3c9d6ba5f19a Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Sat, 17 Jan 2015 16:41:30 -0800
+Subject: [PATCH 4/5] MacPorts Only: Don't embed the deployment target in the
+ asm when using -fno-integrated-as
+
+http://llvm.org/bugs/show_bug.cgi?id=21636
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ lib/CodeGen/AsmPrinter/AsmPrinter.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git llvm_origin_master/lib/CodeGen/AsmPrinter/AsmPrinter.cpp llvm_macports_master/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
+index bbed808..1de5715 100644
+--- llvm_origin_master/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
++++ llvm_macports_master/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
+@@ -186,7 +186,7 @@ bool AsmPrinter::doInitialization(Module &M) {
+ // use the directive, where it would need the same conditionalization
+ // anyway.
+ Triple TT(getTargetTriple());
+- if (TT.isOSDarwin()) {
++ if (TT.isOSDarwin() && MAI->useIntegratedAssembler()) {
+ unsigned Major, Minor, Update;
+ TT.getOSVersion(Major, Minor, Update);
+ // If there is a version specified, Major will be non-zero.
+--
+2.2.2
+
Deleted: trunk/dports/lang/llvm-3.7/files/0004-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/0004-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch 2015-01-17 23:47:53 UTC (rev 131761)
+++ trunk/dports/lang/llvm-3.7/files/0004-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch 2015-01-18 02:19:23 UTC (rev 131762)
@@ -1,318 +0,0 @@
-From 9f0fbe0ed8c421311713b2df58a6b6a121fa88b7 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 4/4] implement atomic<> using mutex/lock_guard for 64b ops on
- 32b PPC not pretty, not fast, but passes atomic tests
-
-(cherry picked from commit 8ec078a3bf34383cf8a0cbc6294ddf0da6bc3bed)
----
- include/__atomic_locked | 240 ++++++++++++++++++++++++++++++++++++++++++++++++
- include/atomic | 45 +++++++++
- 2 files changed, 285 insertions(+)
- create mode 100644 include/__atomic_locked
-
-diff --git a/include/__atomic_locked b/include/__atomic_locked
-new file mode 100644
-index 0000000..f10dd74
---- /dev/null
-+++ b/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 a/include/atomic b/include/atomic
-index 0427a91..7710cd1 100644
---- a/projects/libcxx/include/atomic
-+++ b/projects/libcxx/include/atomic
-@@ -1793,6 +1793,51 @@ 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_HAS_NO_THREADS
-
- #endif // _LIBCPP_ATOMIC
---
-2.2.2
-
Added: trunk/dports/lang/llvm-3.7/files/0005-MacPorts-Only-Skip-checking-for-python-in-configure.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/0005-MacPorts-Only-Skip-checking-for-python-in-configure.patch (rev 0)
+++ trunk/dports/lang/llvm-3.7/files/0005-MacPorts-Only-Skip-checking-for-python-in-configure.patch 2015-01-18 02:19:23 UTC (rev 131762)
@@ -0,0 +1,111 @@
+From cf8cce2b5201c8113a73bb2c0c5e5f6a2d9085b8 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 5/5] MacPorts Only: Skip checking for python in configure
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ configure | 87 ---------------------------------------------------------------
+ 1 file changed, 87 deletions(-)
+
+diff --git llvm_origin_master/configure llvm_macports_master/configure
+index e72c11d..eeedeb7 100755
+--- llvm_origin_master/configure
++++ llvm_macports_master/configure
+@@ -8142,93 +8142,6 @@ CXXFLAGS="$llvm_cv_old_cxxflags"
+ echo "${ECHO_T}$NO_VARIADIC_MACROS $NO_MISSING_FIELD_INITIALIZERS $COVERED_SWITCH_DEFAULT $NO_UNINITIALIZED $NO_MAYBE_UNINITIALIZED $NO_COMMENT" >&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 python27", so it can be a program name with args.
+-set dummy python python2 python27; 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.7 or higher" >&5
+-echo "$as_me: error: could not find python 2.7 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.7" >&5
+-echo $ECHO_N "checking for python >= 2.7... $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 "7") ; 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.7
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: found python $ac_python_version ($PYTHON); required >= 2.7
+-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.7/files/1001-Default-to-ppc7400-for-OSX-10.5.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/1001-Default-to-ppc7400-for-OSX-10.5.patch (rev 0)
+++ trunk/dports/lang/llvm-3.7/files/1001-Default-to-ppc7400-for-OSX-10.5.patch 2015-01-18 02:19:23 UTC (rev 131762)
@@ -0,0 +1,26 @@
+From 971aa68baad8c240f1abf30e62bd947a8923e3fa 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 1001/1006] Default to ppc7400 for OSX 10.5+
+
+---
+ lib/Driver/Tools.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git llvm_master/tools/clang/lib/Driver/Tools.cpp macports_master/tools/clang/lib/Driver/Tools.cpp
+index db43fde..46956e7 100644
+--- llvm_master/tools/clang/lib/Driver/Tools.cpp
++++ macports_master/tools/clang/lib/Driver/Tools.cpp
+@@ -1499,6 +1499,9 @@ static std::string getCPUName(const ArgList &Args, const llvm::Triple &T) {
+ TargetCPUName = "ppc64";
+ else if (T.getArch() == llvm::Triple::ppc64le)
+ TargetCPUName = "ppc64le";
++ else if (T.isOSDarwin() && !T.isMacOSXVersionLT(10,5))
++ // For 10.5+ Altivec is assumed available.
++ TargetCPUName = "7400";
+ else
+ TargetCPUName = "ppc";
+ }
+--
+2.2.2
+
Added: trunk/dports/lang/llvm-3.7/files/1002-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/1002-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch (rev 0)
+++ trunk/dports/lang/llvm-3.7/files/1002-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch 2015-01-18 02:19:23 UTC (rev 131762)
@@ -0,0 +1,84 @@
+From d95bdf342037ee815fa21e871dd9479bc3572550 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 1002/1006] MacPorts Only: Prepare clang-format for replacement
+ with absolute path
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ 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 | 3 +--
+ tools/clang-format/clang-format.py | 2 +-
+ 5 files changed, 5 insertions(+), 6 deletions(-)
+
+diff --git llvm_master/tools/clang/tools/clang-format/clang-format-bbedit.applescript macports_master/tools/clang/tools/clang-format/clang-format-bbedit.applescript
+index fa88fe9..eb09448 100644
+--- llvm_master/tools/clang/tools/clang-format/clang-format-bbedit.applescript
++++ macports_master/tools/clang/tools/clang-format/clang-format-bbedit.applescript
+@@ -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_master/tools/clang/tools/clang-format/clang-format-diff.py macports_master/tools/clang/tools/clang-format/clang-format-diff.py
+index 23adb07..063c5d2 100755
+--- llvm_master/tools/clang/tools/clang-format/clang-format-diff.py
++++ macports_master/tools/clang/tools/clang-format/clang-format-diff.py
+@@ -32,7 +32,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_master/tools/clang/tools/clang-format/clang-format-sublime.py macports_master/tools/clang/tools/clang-format/clang-format-sublime.py
+index 16ff56e..4b68104 100644
+--- llvm_master/tools/clang/tools/clang-format/clang-format-sublime.py
++++ macports_master/tools/clang/tools/clang-format/clang-format-sublime.py
+@@ -18,7 +18,7 @@ import sublime_plugin
+ 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_master/tools/clang/tools/clang-format/clang-format.el macports_master/tools/clang/tools/clang-format/clang-format.el
+index ab0991b..a2a278a 100644
+--- llvm_master/tools/clang/tools/clang-format/clang-format.el
++++ macports_master/tools/clang/tools/clang-format/clang-format.el
+@@ -36,8 +36,7 @@
+ :group 'tools)
+
+ (defcustom clang-format-executable
+- (or (executable-find "clang-format")
+- "clang-format")
++ "@CLANG_FORMAT_PATH@"
+ "Location of the clang-format executable.
+
+ A string containing the name or the full path of the executable."
+diff --git llvm_master/tools/clang/tools/clang-format/clang-format.py macports_master/tools/clang/tools/clang-format/clang-format.py
+index a79205a..e71362a 100644
+--- llvm_master/tools/clang/tools/clang-format/clang-format.py
++++ macports_master/tools/clang/tools/clang-format/clang-format.py
+@@ -25,7 +25,7 @@ import vim
+
+ # set g:clang_format_path to the path to clang-format if it is not on the path
+ # Change this to the full path if clang-format is not on the path.
+-binary = 'clang-format'
++binary = '@CLANG_FORMAT_PATH@'
+ if vim.eval('exists("g:clang_format_path")') == "1":
+ binary = vim.eval('g:clang_format_path')
+
+--
+2.2.2
+
Added: trunk/dports/lang/llvm-3.7/files/1003-MacPorts-Only-Fall-back-on-xcodebuild-sdk-when-xcrun.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/1003-MacPorts-Only-Fall-back-on-xcodebuild-sdk-when-xcrun.patch (rev 0)
+++ trunk/dports/lang/llvm-3.7/files/1003-MacPorts-Only-Fall-back-on-xcodebuild-sdk-when-xcrun.patch 2015-01-18 02:19:23 UTC (rev 131762)
@@ -0,0 +1,39 @@
+From c69389a9ad48948076d754f99b94fbf797ea01fd Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Sat, 17 Jan 2015 17:51:10 -0800
+Subject: [PATCH 1003/1006] MacPorts Only: Fall back on xcodebuild -sdk when
+ xcrun --sdk is not supported
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ runtime/compiler-rt/Makefile | 14 ++++++++++++--
+ 1 file changed, 12 insertions(+), 2 deletions(-)
+
+diff --git llvm_master/tools/clang/runtime/compiler-rt/Makefile macports_master/tools/clang/runtime/compiler-rt/Makefile
+index f06ef99..b0946ba 100644
+--- llvm_master/tools/clang/runtime/compiler-rt/Makefile
++++ macports_master/tools/clang/runtime/compiler-rt/Makefile
+@@ -81,8 +81,18 @@ RuntimeLibrary.darwin.Configs := \
+ profile_osx.a \
+ ubsan_osx.a
+
+-IOS_SDK := $(shell xcrun --show-sdk-path -sdk iphoneos 2> /dev/null)
+-IOSSIM_SDK := $(shell xcrun --show-sdk-path -sdk iphonesimulator 2> /dev/null)
++XCRunSdkPath = \
++ $(shell \
++ result=`xcrun --sdk $(1) --show-sdk-path 2> /dev/null`; \
++ if [ "$$?" != "0" ]; then \
++ result=`xcodebuild -sdk $(1) -version 2> /dev/null \
++ | sed -n 's/^Path: \(..*\)$$/\1/p'`; \
++ fi; \
++ if [ "$$?" != "0" ]; then result=""; fi; \
++ echo $$result)
++
++IOS_SDK := $(call XCRunSdkPath,iphoneos)
++IOSSIM_SDK := $(call XCRunSdkPath,iphonesimulator)
+
+ ifneq ($(IOS_SDK)$(IOSSIM_SDK),)
+ RuntimeLibrary.darwin.Configs += ios.a profile_ios.a
+--
+2.2.2
+
Added: trunk/dports/lang/llvm-3.7/files/1004-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/1004-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch (rev 0)
+++ trunk/dports/lang/llvm-3.7/files/1004-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch 2015-01-18 02:19:23 UTC (rev 131762)
@@ -0,0 +1,29 @@
+From cf37a2cc4435f757228e928f5fbfb6cadd1b2e21 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 1004/1006] 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>
+---
+ tools/scan-build/scan-build | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git llvm_master/tools/clang/tools/scan-build/scan-build macports_master/tools/clang/tools/scan-build/scan-build
+index d52d8f5..2a3d1db 100755
+--- llvm_master/tools/clang/tools/scan-build/scan-build
++++ macports_master/tools/clang/tools/scan-build/scan-build
+@@ -1728,6 +1728,8 @@ if (defined $OutputFormat) {
+ 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.7/files/1005-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/1005-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch (rev 0)
+++ trunk/dports/lang/llvm-3.7/files/1005-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch 2015-01-18 02:19:23 UTC (rev 131762)
@@ -0,0 +1,27 @@
+From 1e79aa1d2d652fe79c244c185eeff76c2e40caf2 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 1005/1006] MacPorts Only: Fix libclang_rt dylib ids
+
+We should probably not be shipping these.
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ runtime/compiler-rt/Makefile | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git llvm_master/tools/clang/runtime/compiler-rt/Makefile macports_master/tools/clang/runtime/compiler-rt/Makefile
+index b0946ba..5549038 100644
+--- llvm_master/tools/clang/runtime/compiler-rt/Makefile
++++ macports_master/tools/clang/runtime/compiler-rt/Makefile
+@@ -244,6 +244,7 @@ $(PROJ_resources_lib)/$1/libclang_rt.%.dylib: \
+ $(ResourceLibDir)/$1/libclang_rt.%.dylib | $(PROJ_resources_lib)/$1
+ $(Echo) Installing compiler runtime library: $1/$$*
+ $(Verb) $(DataInstall) $$< $(PROJ_resources_lib)/$1
++ $(Verb) install_name_tool $$@ -id $$(patsubst $(DESTDIR)%,%,$$@)
+
+ # Rule to install runtime libraries.
+ RuntimeLibraryInstall.$1: \
+--
+2.2.2
+
Added: trunk/dports/lang/llvm-3.7/files/1006-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/1006-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch (rev 0)
+++ trunk/dports/lang/llvm-3.7/files/1006-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch 2015-01-18 02:19:23 UTC (rev 131762)
@@ -0,0 +1,74 @@
+From 0111fcf6f32dfeb41ae0b1e9be0258b899d97200 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 1006/1006] MacPorts Only: Relocate clang resources using llvm
+ version
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ lib/Headers/Makefile | 3 ++-
+ runtime/compiler-rt/Makefile | 15 ++++++++++++++-
+ 2 files changed, 16 insertions(+), 2 deletions(-)
+
+diff --git llvm_master/tools/clang/lib/Headers/Makefile macports_master/tools/clang/lib/Headers/Makefile
+index 903acac..7c37992 100644
+--- llvm_master/tools/clang/lib/Headers/Makefile
++++ macports_master/tools/clang/lib/Headers/Makefile
+@@ -16,6 +16,7 @@ include $(CLANG_LEVEL)/Makefile
+
+ CLANG_VERSION := $(word 3,$(shell grep "CLANG_VERSION " \
+ $(PROJ_OBJ_DIR)/$(CLANG_LEVEL)/include/clang/Basic/Version.inc))
++LLVM_VERSION := $(LLVM_VERSION_MAJOR).$(LLVM_VERSION_MINOR)
+
+ HeaderDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/lib/clang/$(CLANG_VERSION)/include
+
+@@ -40,7 +41,7 @@ $(HeaderDir)/module.modulemap: $(PROJ_SRC_DIR)/module.modulemap $(HeaderDir)/.di
+ # Hook into the standard Makefile rules.
+ all-local:: $(OBJHEADERS) $(HeaderDir)/module.modulemap
+
+-PROJ_headers := $(DESTDIR)$(PROJ_prefix)/lib/clang/$(CLANG_VERSION)/include
++PROJ_headers := $(DESTDIR)$(PROJ_prefix)/lib/clang/$(LLVM_VERSION)/include
+
+ INSTHEADERS := $(addprefix $(PROJ_headers)/, $(HEADERS))
+ INSTHEADERS += $(PROJ_headers)/arm_neon.h
+diff --git llvm_master/tools/clang/runtime/compiler-rt/Makefile macports_master/tools/clang/runtime/compiler-rt/Makefile
+index 5549038..50f0a81 100644
+--- llvm_master/tools/clang/runtime/compiler-rt/Makefile
++++ macports_master/tools/clang/runtime/compiler-rt/Makefile
+@@ -18,9 +18,10 @@ include $(CLANG_LEVEL)/Makefile
+
+ CLANG_VERSION := $(word 3,$(shell grep "CLANG_VERSION " \
+ $(PROJ_OBJ_DIR)/$(CLANG_LEVEL)/include/clang/Basic/Version.inc))
++LLVM_VERSION := $(LLVM_VERSION_MAJOR).$(LLVM_VERSION_MINOR)
+
+ ResourceDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/lib/clang/$(CLANG_VERSION)
+-PROJ_resources := $(DESTDIR)$(PROJ_prefix)/lib/clang/$(CLANG_VERSION)
++PROJ_resources := $(DESTDIR)$(PROJ_prefix)/lib/clang/$(LLVM_VERSION)
+
+ ResourceLibDir := $(ResourceDir)/lib
+ ResourceIncludeDir := $(ResourceDir)/include
+@@ -265,9 +266,21 @@ $(PROJ_resources_include)/sanitizer: $(ResourceIncludeDir)/sanitizer $(PROJ_reso
+ RuntimeHeaderInstall: $(PROJ_resources_include)/sanitizer
+ .PHONY: RuntimeHeaderInstall
+
++# Make sure $(PROJ_resources) exists before creating the symlink.
++$(PROJ_resources:$(LLVM_VERSION)=$(CLANG_VERSION)):
++ $(Echo) Creating compiler runtime compatibility symlink
++ $(Verb) $(MKDIR) $(dir $@)
++ $(Verb) ln -s $(LLVM_VERSION) $@
++
++MacPortsClangResSymlinkInstall: $(PROJ_resources:$(LLVM_VERSION)=$(CLANG_VERSION))
++.PHONY: MacPortsClangResSymlinkInstall
++
+ # Hook into the standard Makefile rules.
+ all-local:: $(RuntimeDirs:%=RuntimeLibrary.%) RuntimeHeader
+ install-local:: $(RuntimeDirs:%=RuntimeLibraryInstall.%) RuntimeHeaderInstall
++ifneq ($(LLVM_VERSION),$(CLANG_VERSION))
++install-local:: MacPortsClangResSymlinkInstall
++endif
+ clean-local:: CleanRuntimeLibraries
+
+ endif
+--
+2.2.2
+
Added: trunk/dports/lang/llvm-3.7/files/2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch (rev 0)
+++ trunk/dports/lang/llvm-3.7/files/2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch 2015-01-18 02:19:23 UTC (rev 131762)
@@ -0,0 +1,36 @@
+From 2972ffafff4a394f521986b47810324cd1b7e3ba 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/2003] MacPorts Only: Comment out SL cctools workaround
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ make/platform/clang_darwin.mk | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk macports_master/projects/compiler-rt/make/platform/clang_darwin.mk
+index f4f548e..6f62170 100644
+--- llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk
++++ macports_master/projects/compiler-rt/make/platform/clang_darwin.mk
+@@ -122,12 +122,12 @@ UniversalArchs.ubsan_osx := $(call CheckArches,i386 x86_64 x86_64h,ubsan_osx,$(O
+ # 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.7/files/2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch (rev 0)
+++ trunk/dports/lang/llvm-3.7/files/2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch 2015-01-18 02:19:23 UTC (rev 131762)
@@ -0,0 +1,31 @@
+From b16ca706de5eeb244b1fe889760ae4339b23a170 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Sat, 10 Jan 2015 03:34:51 -0800
+Subject: [PATCH 2002/2003] Update CheckArches to fallback on Intel/ppc if ld
+ -v doesn't report supported architectures
+
+Older versions of ld64 (eg: Xcode 3.x) do not report this.
+
+http://www.llvm.org/bugs/show_bug.cgi?id=22182
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ make/platform/clang_darwin.mk | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk macports_master/projects/compiler-rt/make/platform/clang_darwin.mk
+index 6f62170..0120547 100644
+--- llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk
++++ macports_master/projects/compiler-rt/make/platform/clang_darwin.mk
+@@ -25,6 +25,8 @@ CheckArches = \
+ if $(LD) -v 2>&1 | grep "configured to support" \
+ | tr ' ' '\n' | grep "^$$arch$$" >/dev/null 2>/dev/null; then \
+ result="$$result$$arch "; \
++ elif ! ( $(LD) -v 2>&1 | grep "configured to support" ) && test "$$arch" = "i386" -o "$$arch" = "x86_64" -o "$$arch" = "ppc" -o "$$arch" = "ppc64" ; then \
++ result="$$result$$arch "; \
+ else \
+ printf 1>&2 \
+ "warning: clang_darwin.mk: dropping arch '$$arch' from lib '$(2)'";\
+--
+2.2.2
+
Added: trunk/dports/lang/llvm-3.7/files/2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch (rev 0)
+++ trunk/dports/lang/llvm-3.7/files/2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch 2015-01-18 02:19:23 UTC (rev 131762)
@@ -0,0 +1,29 @@
+From e1ded9c3e06fb5c97d8936b77ccf8982e52a7b69 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Sat, 17 Jan 2015 17:45:27 -0800
+Subject: [PATCH 2003/2003] Fall back on xcodebuild -sdk when xcrun --sdk is
+ not supported
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ make/platform/clang_darwin.mk | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk macports_master/projects/compiler-rt/make/platform/clang_darwin.mk
+index 0120547..ac8de4a 100644
+--- llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk
++++ macports_master/projects/compiler-rt/make/platform/clang_darwin.mk
+@@ -49,6 +49,10 @@ XCRun = \
+ XCRunSdkPath = \
+ $(shell \
+ result=`xcrun --sdk $(1) --show-sdk-path 2> /dev/null`; \
++ if [ "$$?" != "0" ]; then \
++ result=`xcodebuild -sdk $(1) -version 2> /dev/null \
++ | sed -n 's/^Path: \(..*\)$$/\1/p'`; \
++ fi; \
+ if [ "$$?" != "0" ]; then result=""; fi; \
+ echo $$result)
+ ###
+--
+2.2.2
+
Added: trunk/dports/lang/llvm-3.7/files/3001-buildit-build-fix-for-Leopard.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/3001-buildit-build-fix-for-Leopard.patch (rev 0)
+++ trunk/dports/lang/llvm-3.7/files/3001-buildit-build-fix-for-Leopard.patch 2015-01-18 02:19:23 UTC (rev 131762)
@@ -0,0 +1,35 @@
+From b46773a9b7d9867cbfc74d203cd9a444e323d1f7 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>
+---
+ lib/buildit | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git llvm_master/projects/libcxx/lib/buildit macports_master/projects/libcxx/lib/buildit
+index 7e3bc2e..2740dee 100755
+--- llvm_master/projects/libcxx/lib/buildit
++++ macports_master/projects/libcxx/lib/buildit
+@@ -50,7 +50,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 \
+@@ -59,7 +59,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.7/files/3002-buildit-Set-compatibility-version-to-RC_ProjectSourc.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/3002-buildit-Set-compatibility-version-to-RC_ProjectSourc.patch (rev 0)
+++ trunk/dports/lang/llvm-3.7/files/3002-buildit-Set-compatibility-version-to-RC_ProjectSourc.patch 2015-01-18 02:19:23 UTC (rev 131762)
@@ -0,0 +1,28 @@
+From ce37e96b968fbcc4b6aef18b1a163d297db903b2 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>
+---
+ lib/buildit | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git llvm_master/projects/libcxx/lib/buildit macports_master/projects/libcxx/lib/buildit
+index 2740dee..c74683f 100755
+--- llvm_master/projects/libcxx/lib/buildit
++++ macports_master/projects/libcxx/lib/buildit
+@@ -54,7 +54,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.7/files/3003-Fix-local-and-iterator-when-building-with-Lion-and-n.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/3003-Fix-local-and-iterator-when-building-with-Lion-and-n.patch (rev 0)
+++ trunk/dports/lang/llvm-3.7/files/3003-Fix-local-and-iterator-when-building-with-Lion-and-n.patch 2015-01-18 02:19:23 UTC (rev 131762)
@@ -0,0 +1,45 @@
+From cb271d6ce269bbddc916643c495ccbdfde6e3054 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>
+---
+ include/iterator | 4 ++--
+ include/locale | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git llvm_master/projects/libcxx/include/iterator macports_master/projects/libcxx/include/iterator
+index bcf142a..0b90d96 100644
+--- llvm_master/projects/libcxx/include/iterator
++++ macports_master/projects/libcxx/include/iterator
+@@ -920,8 +920,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_master/projects/libcxx/include/locale macports_master/projects/libcxx/include/locale
+index 0d01002..789b083 100644
+--- llvm_master/projects/libcxx/include/locale
++++ macports_master/projects/libcxx/include/locale
+@@ -1473,8 +1473,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.7/files/3004-Fix-missing-long-long-math-prototypes-when-using-the.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/3004-Fix-missing-long-long-math-prototypes-when-using-the.patch (rev 0)
+++ trunk/dports/lang/llvm-3.7/files/3004-Fix-missing-long-long-math-prototypes-when-using-the.patch 2015-01-18 02:19:23 UTC (rev 131762)
@@ -0,0 +1,41 @@
+From afdc64a717d3b284f920944146952bcbbc111cd0 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>
+---
+ include/cmath | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+diff --git llvm_master/projects/libcxx/include/cmath macports_master/projects/libcxx/include/cmath
+index d3aa4be..eb91dfb 100644
+--- llvm_master/projects/libcxx/include/cmath
++++ macports_master/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.7/files/3005-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/3005-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch (rev 0)
+++ trunk/dports/lang/llvm-3.7/files/3005-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch 2015-01-18 02:19:23 UTC (rev 131762)
@@ -0,0 +1,317 @@
+From 88eccd6a4edd5675ab6657464c004a249893c974 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
+
+---
+ include/__atomic_locked | 240 ++++++++++++++++++++++++++++++++++++++++++++++++
+ include/atomic | 45 +++++++++
+ 2 files changed, 285 insertions(+)
+ create mode 100644 include/__atomic_locked
+
+diff --git llvm_master/projects/libcxx/include/__atomic_locked macports_master/projects/libcxx/include/__atomic_locked
+new file mode 100644
+index 0000000..f10dd74
+--- /dev/null
++++ macports_master/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_master/projects/libcxx/include/atomic macports_master/projects/libcxx/include/atomic
+index 0427a91..7710cd1 100644
+--- llvm_master/projects/libcxx/include/atomic
++++ macports_master/projects/libcxx/include/atomic
+@@ -1793,6 +1793,51 @@ 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_HAS_NO_THREADS
+
+ #endif // _LIBCPP_ATOMIC
+--
+2.2.2
+
Deleted: trunk/dports/lang/llvm-3.7/files/clang-format.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/clang-format.patch 2015-01-17 23:47:53 UTC (rev 131761)
+++ trunk/dports/lang/llvm-3.7/files/clang-format.patch 2015-01-18 02:19:23 UTC (rev 131762)
@@ -1,74 +0,0 @@
-diff -Naurp trunk.orig/Makefile trunk/Makefile
---- trunk.orig/Makefile 2014-11-24 11:32:24.000000000 -0800
-+++ trunk/Makefile 2014-11-24 11:34:41.000000000 -0800
-@@ -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
-diff -Naurp trunk.orig/tools/clang/tools/clang-format/clang-format-bbedit.applescript trunk/tools/clang/tools/clang-format/clang-format-bbedit.applescript
---- trunk.orig/tools/clang/tools/clang-format/clang-format-bbedit.applescript 2014-11-24 11:31:46.000000000 -0800
-+++ trunk/tools/clang/tools/clang-format/clang-format-bbedit.applescript 2014-11-24 11:34:41.000000000 -0800
-@@ -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 -Naurp trunk.orig/tools/clang/tools/clang-format/clang-format-diff.py trunk/tools/clang/tools/clang-format/clang-format-diff.py
---- trunk.orig/tools/clang/tools/clang-format/clang-format-diff.py 2014-11-24 11:31:46.000000000 -0800
-+++ trunk/tools/clang/tools/clang-format/clang-format-diff.py 2014-11-24 11:34:41.000000000 -0800
-@@ -32,7 +32,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 -Naurp trunk.orig/tools/clang/tools/clang-format/clang-format-sublime.py trunk/tools/clang/tools/clang-format/clang-format-sublime.py
---- trunk.orig/tools/clang/tools/clang-format/clang-format-sublime.py 2014-11-24 11:31:46.000000000 -0800
-+++ trunk/tools/clang/tools/clang-format/clang-format-sublime.py 2014-11-24 11:34:41.000000000 -0800
-@@ -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 -Naurp trunk.orig/tools/clang/tools/clang-format/clang-format.el trunk/tools/clang/tools/clang-format/clang-format.el
---- trunk.orig/tools/clang/tools/clang-format/clang-format.el 2014-11-24 11:31:46.000000000 -0800
-+++ trunk/tools/clang/tools/clang-format/clang-format.el 2014-11-24 11:34:41.000000000 -0800
-@@ -36,8 +36,7 @@
- :group 'tools)
-
- (defcustom clang-format-executable
-- (or (executable-find "clang-format")
-- "clang-format")
-+ "@CLANG_FORMAT_PATH@"
- "Location of the clang-format executable.
-
- A string containing the name or the full path of the executable."
-diff -Naurp trunk.orig/tools/clang/tools/clang-format/clang-format.py trunk/tools/clang/tools/clang-format/clang-format.py
---- trunk.orig/tools/clang/tools/clang-format/clang-format.py 2014-11-24 11:31:46.000000000 -0800
-+++ trunk/tools/clang/tools/clang-format/clang-format.py 2014-11-24 11:35:39.000000000 -0800
-@@ -25,7 +25,7 @@ import vim
-
- # set g:clang_format_path to the path to clang-format if it is not on the path
- # Change this to the full path if clang-format is not on the path.
--binary = 'clang-format'
-+binary = '@CLANG_FORMAT_PATH@'
- if vim.eval('exists("g:clang_format_path")') == "1":
- binary = vim.eval('g:clang_format_path')
-
Deleted: trunk/dports/lang/llvm-3.7/files/clang-modernize.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/clang-modernize.patch 2015-01-17 23:47:53 UTC (rev 131761)
+++ trunk/dports/lang/llvm-3.7/files/clang-modernize.patch 2015-01-18 02:19:23 UTC (rev 131762)
@@ -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.7/files/fix-dylib-ids.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/fix-dylib-ids.patch 2015-01-17 23:47:53 UTC (rev 131761)
+++ trunk/dports/lang/llvm-3.7/files/fix-dylib-ids.patch 2015-01-18 02:19:23 UTC (rev 131762)
@@ -1,18 +0,0 @@
-diff --git a/Makefile.rules b/Makefile.rules
-index c8c971f..78b9c51 100644
---- a/Makefile.rules
-+++ b/Makefile.rules
-@@ -598,7 +598,12 @@ ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW))
- ifneq ($(HOST_OS),Darwin)
- LD.Flags += $(RPATH) -Wl,'$$ORIGIN'
- else
-- LD.Flags += -Wl,-install_name -Wl,"@rpath/lib$(LIBRARYNAME)$(SHLIBEXT)"
-+ LD.Flags += -Wl,-install_name
-+ 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.7/files/fix-libclang_rt-dylib-ids.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/fix-libclang_rt-dylib-ids.patch 2015-01-17 23:47:53 UTC (rev 131761)
+++ trunk/dports/lang/llvm-3.7/files/fix-libclang_rt-dylib-ids.patch 2015-01-18 02:19:23 UTC (rev 131762)
@@ -1,12 +0,0 @@
-Index: llvm-3.6svn/tools/clang/runtime/compiler-rt/Makefile
-===================================================================
---- llvm-3.6svn.orig/tools/clang/runtime/compiler-rt/Makefile
-+++ llvm-3.6svn/tools/clang/runtime/compiler-rt/Makefile
-@@ -235,6 +235,7 @@ $(PROJ_resources_lib)/$1/libclang_rt.%.d
- $(ResourceLibDir)/$1/libclang_rt.%.dylib | $(PROJ_resources_lib)/$1
- $(Echo) Installing compiler runtime library: $1/$$*
- $(Verb) $(DataInstall) $$< $(PROJ_resources_lib)/$1
-+ $(Verb) install_name_tool $$@ -id $$(patsubst $(DESTDIR)%,%,$$@)
-
- # Rule to install runtime libraries.
- RuntimeLibraryInstall.$1: \
Deleted: trunk/dports/lang/llvm-3.7/files/install_target.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/install_target.patch 2015-01-17 23:47:53 UTC (rev 131761)
+++ trunk/dports/lang/llvm-3.7/files/install_target.patch 2015-01-18 02:19:23 UTC (rev 131762)
@@ -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
Added: trunk/dports/lang/llvm-3.7/files/leopard-no-blocks.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/leopard-no-blocks.patch (rev 0)
+++ trunk/dports/lang/llvm-3.7/files/leopard-no-blocks.patch 2015-01-18 02:19:23 UTC (rev 131762)
@@ -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/Block.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.7/files/lion-xcrun-fallback.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/lion-xcrun-fallback.patch 2015-01-17 23:47:53 UTC (rev 131761)
+++ trunk/dports/lang/llvm-3.7/files/lion-xcrun-fallback.patch 2015-01-18 02:19:23 UTC (rev 131762)
@@ -1,40 +0,0 @@
-diff --git a/projects/compiler-rt/make/platform/clang_darwin.mk b/projects/compiler-rt/make/platform/clang_darwin.mk
-index 6ed3230..b4917c8 100644
---- a/projects/compiler-rt/make/platform/clang_darwin.mk
-+++ b/projects/compiler-rt/make/platform/clang_darwin.mk
-@@ -47,6 +47,10 @@ XCRun = \
- XCRunSdkPath = \
- $(shell \
- result=`xcrun --sdk $(1) --show-sdk-path 2> /dev/null`; \
-+ if [ "$$?" != "0" ]; then \
-+ result=`xcodebuild -sdk $(1) -version 2> /dev/null \
-+ | sed -n 's/^Path: \(..*\)$$/\1/p'`; \
-+ fi; \
- if [ "$$?" != "0" ]; then result=""; fi; \
- echo $$result)
- ###
-diff --git a/tools/clang/runtime/compiler-rt/Makefile b/tools/clang/runtime/compiler-rt/Makefile
-index 95c9fb7..50f0a81 100644
---- a/tools/clang/runtime/compiler-rt/Makefile
-+++ b/tools/clang/runtime/compiler-rt/Makefile
-@@ -82,8 +82,18 @@ RuntimeLibrary.darwin.Configs := \
- profile_osx.a \
- ubsan_osx.a
-
--IOS_SDK := $(shell xcrun --show-sdk-path -sdk iphoneos 2> /dev/null)
--IOSSIM_SDK := $(shell xcrun --show-sdk-path -sdk iphonesimulator 2> /dev/null)
-+XCRunSdkPath = \
-+ $(shell \
-+ result=`xcrun --sdk $(1) --show-sdk-path 2> /dev/null`; \
-+ if [ "$$?" != "0" ]; then \
-+ result=`xcodebuild -sdk $(1) -version 2> /dev/null \
-+ | sed -n 's/^Path: \(..*\)$$/\1/p'`; \
-+ fi; \
-+ if [ "$$?" != "0" ]; then result=""; fi; \
-+ echo $$result)
-+
-+IOS_SDK := $(call XCRunSdkPath,iphoneos)
-+IOSSIM_SDK := $(call XCRunSdkPath,iphonesimulator)
-
- ifneq ($(IOS_SDK)$(IOSSIM_SDK),)
- RuntimeLibrary.darwin.Configs += ios.a profile_ios.a
Deleted: trunk/dports/lang/llvm-3.7/files/llvm-integrated-as.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/llvm-integrated-as.patch 2015-01-17 23:47:53 UTC (rev 131761)
+++ trunk/dports/lang/llvm-3.7/files/llvm-integrated-as.patch 2015-01-18 02:19:23 UTC (rev 131762)
@@ -1,15 +0,0 @@
-http://llvm.org/bugs/show_bug.cgi?id=21636
-
-Index: lib/CodeGen/AsmPrinter/AsmPrinter.cpp
-===================================================================
---- a/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
-+++ b/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
-@@ -186,7 +186,7 @@
- // use the directive, where it would need the same conditionalization
- // anyway.
- Triple TT(getTargetTriple());
-- if (TT.isOSDarwin()) {
-+ if (TT.isOSDarwin() && MAI->useIntegratedAssembler()) {
- unsigned Major, Minor, Update;
- TT.getOSVersion(Major, Minor, Update);
- // If there is a version specified, Major will be non-zero.
Deleted: trunk/dports/lang/llvm-3.7/files/move-clang-resources.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/move-clang-resources.patch 2015-01-17 23:47:53 UTC (rev 131761)
+++ trunk/dports/lang/llvm-3.7/files/move-clang-resources.patch 2015-01-18 02:19:23 UTC (rev 131762)
@@ -1,59 +0,0 @@
-diff --git a/tools/clang/lib/Headers/Makefile b/tools/clang/lib/Headers/Makefile
-index 903acac..7c37992 100644
---- a/tools/clang/lib/Headers/Makefile
-+++ b/tools/clang/lib/Headers/Makefile
-@@ -16,6 +16,7 @@ include $(CLANG_LEVEL)/Makefile
-
- CLANG_VERSION := $(word 3,$(shell grep "CLANG_VERSION " \
- $(PROJ_OBJ_DIR)/$(CLANG_LEVEL)/include/clang/Basic/Version.inc))
-+LLVM_VERSION := $(LLVM_VERSION_MAJOR).$(LLVM_VERSION_MINOR)
-
- HeaderDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/lib/clang/$(CLANG_VERSION)/include
-
-@@ -40,7 +41,7 @@ $(HeaderDir)/module.modulemap: $(PROJ_SRC_DIR)/module.modulemap $(HeaderDir)/.di
- # Hook into the standard Makefile rules.
- all-local:: $(OBJHEADERS) $(HeaderDir)/module.modulemap
-
--PROJ_headers := $(DESTDIR)$(PROJ_prefix)/lib/clang/$(CLANG_VERSION)/include
-+PROJ_headers := $(DESTDIR)$(PROJ_prefix)/lib/clang/$(LLVM_VERSION)/include
-
- INSTHEADERS := $(addprefix $(PROJ_headers)/, $(HEADERS))
- INSTHEADERS += $(PROJ_headers)/arm_neon.h
-diff --git a/tools/clang/runtime/compiler-rt/Makefile b/tools/clang/runtime/compiler-rt/Makefile
-index f06ef99..947dd9a 100644
---- a/tools/clang/runtime/compiler-rt/Makefile
-+++ b/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
-@@ -254,9 +255,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
Deleted: trunk/dports/lang/llvm-3.7/files/scan-build-PR-35006.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/scan-build-PR-35006.patch 2015-01-17 23:47:53 UTC (rev 131761)
+++ trunk/dports/lang/llvm-3.7/files/scan-build-PR-35006.patch 2015-01-18 02:19:23 UTC (rev 131762)
@@ -1,13 +0,0 @@
-Index: llvm-3.6svn/tools/clang/tools/scan-build/scan-build
-===================================================================
---- llvm-3.6svn.orig/tools/clang/tools/scan-build/scan-build
-+++ llvm-3.6svn/tools/clang/tools/scan-build/scan-build
-@@ -1728,6 +1728,8 @@ if (defined $OutputFormat) {
- Diag "Analysis run complete.\n";
- Diag "Viewing analysis results in '$HtmlDir' using scan-view.\n";
- my $ScanView = Cwd::realpath("$RealBin/scan-view");
-+ 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.7/files/skip-python-check.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/skip-python-check.patch 2015-01-17 23:47:53 UTC (rev 131761)
+++ trunk/dports/lang/llvm-3.7/files/skip-python-check.patch 2015-01-18 02:19:23 UTC (rev 131762)
@@ -1,98 +0,0 @@
-diff --git a/configure b/configure
-index b8cb1e2..b6ef26f 100755
---- a/configure
-+++ b/configure
-@@ -8142,93 +8142,6 @@ CXXFLAGS="$llvm_cv_old_cxxflags"
- echo "${ECHO_T}$NO_VARIADIC_MACROS $NO_MISSING_FIELD_INITIALIZERS $COVERED_SWITCH_DEFAULT $NO_UNINITIALIZED $NO_MAYBE_UNINITIALIZED $NO_COMMENT" >&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 python27", so it can be a program name with args.
--set dummy python python2 python27; 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.7 or higher" >&5
--echo "$as_me: error: could not find python 2.7 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.7" >&5
--echo $ECHO_N "checking for python >= 2.7... $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 "7") ; 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.7
--See \`config.log' for more details." >&5
--echo "$as_me: error: found python $ac_python_version ($PYTHON); required >= 2.7
--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.7/files/snowleopard-cmath.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/snowleopard-cmath.patch 2015-01-17 23:47:53 UTC (rev 131761)
+++ trunk/dports/lang/llvm-3.7/files/snowleopard-cmath.patch 2015-01-18 02:19:23 UTC (rev 131762)
@@ -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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150117/40aa3827/attachment-0001.html>
More information about the macports-changes
mailing list