[112895] trunk/dports/lang
jeremyhu at macports.org
jeremyhu at macports.org
Sun Nov 3 10:07:06 PST 2013
Revision: 112895
https://trac.macports.org/changeset/112895
Author: jeremyhu at macports.org
Date: 2013-11-03 10:07:06 -0800 (Sun, 03 Nov 2013)
Log Message:
-----------
{clang,dragonegg,llvm}-3.4: Bump to r193941
Revision Links:
--------------
https://trac.macports.org/changeset/193941
Modified Paths:
--------------
trunk/dports/lang/dragonegg-3.4/Portfile
trunk/dports/lang/llvm-3.2/Portfile
trunk/dports/lang/llvm-3.3/Portfile
trunk/dports/lang/llvm-3.4/Portfile
Added Paths:
-----------
trunk/dports/lang/llvm-3.3/files/mavericks-libc++.patch
Modified: trunk/dports/lang/dragonegg-3.4/Portfile
===================================================================
--- trunk/dports/lang/dragonegg-3.4/Portfile 2013-11-03 17:53:41 UTC (rev 112894)
+++ trunk/dports/lang/dragonegg-3.4/Portfile 2013-11-03 18:07:06 UTC (rev 112895)
@@ -77,7 +77,7 @@
depends_skip_archcheck-append gcc${gcc_version_no_dot}
fetch.type svn
-svn.revision 193358
+svn.revision 193941
version ${llvm_version}-r${svn.revision}
worksrcdir trunk
svn.url http://llvm.org/svn/llvm-project/dragonegg/trunk
Modified: trunk/dports/lang/llvm-3.2/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.2/Portfile 2013-11-03 17:53:41 UTC (rev 112894)
+++ trunk/dports/lang/llvm-3.2/Portfile 2013-11-03 18:07:06 UTC (rev 112895)
@@ -6,7 +6,7 @@
set llvm_version 3.2
revision 2
name llvm-${llvm_version}
-subport clang-${llvm_version} {}
+subport clang-${llvm_version} { revision 3 }
set suffix mp-${llvm_version}
set sub_prefix ${prefix}/libexec/llvm-${llvm_version}
dist_subdir llvm
@@ -15,17 +15,6 @@
license NCSA
maintainers jeremyhu
-platform darwin {
- if {${os.major} >= 13} {
- depends_lib
- depends_run
- pre-fetch {
- ui_error "$name is not supported on Mavericks or later."
- error "unsupported platform"
- }
- }
-}
-
if {${subport} == "llvm-${llvm_version}"} {
homepage http://llvm.org/
description llvm is a next generation compiler infrastructure
@@ -106,7 +95,8 @@
patchfiles-append tiger-shlib-clang.patch tiger-libclang.patch scan-build-PR-35006.patch \
0001-Comment-out-SL-cctools-workaround.patch \
asan-pthread_workqueue.patch \
- 0002-PR12597-Remove-chown-R-root-wheel-from-the-makefile.patch
+ 0002-PR12597-Remove-chown-R-root-wheel-from-the-makefile.patch \
+ mavericks-libc++.patch
build.target clang-only
destroot.target install-clang
Modified: trunk/dports/lang/llvm-3.3/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.3/Portfile 2013-11-03 17:53:41 UTC (rev 112894)
+++ trunk/dports/lang/llvm-3.3/Portfile 2013-11-03 18:07:06 UTC (rev 112895)
@@ -6,7 +6,7 @@
set llvm_version 3.3
revision 1
name llvm-${llvm_version}
-subport clang-${llvm_version} {}
+subport clang-${llvm_version} { revision 2 }
set suffix mp-${llvm_version}
set sub_prefix ${prefix}/libexec/llvm-${llvm_version}
dist_subdir llvm
@@ -93,7 +93,8 @@
}
patchfiles-append tiger-shlib-clang.patch tiger-libclang.patch scan-build-PR-35006.patch \
- 0001-Comment-out-SL-cctools-workaround.patch
+ 0001-Comment-out-SL-cctools-workaround.patch \
+ mavericks-libc++.patch
build.target clang-only
destroot.target install-clang
Added: trunk/dports/lang/llvm-3.3/files/mavericks-libc++.patch
===================================================================
--- trunk/dports/lang/llvm-3.3/files/mavericks-libc++.patch (rev 0)
+++ trunk/dports/lang/llvm-3.3/files/mavericks-libc++.patch 2013-11-03 18:07:06 UTC (rev 112895)
@@ -0,0 +1,41 @@
+commit 66dbb3f95e1666089acd3431792d02c623e459fc
+Author: Bob Wilson <bob.wilson at apple.com>
+Date: Sat Nov 2 23:19:53 2013 +0000
+
+ Default to use libc++ on OS X 10.9+ and iOS 7+.
+
+ git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@193934 91177308-0d34-0410-b5e6-96231b3b80d8
+
+diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp
+index 99a182e..cc1efb6 100644
+--- a/tools/clang/lib/Driver/ToolChains.cpp
++++ b/tools/clang/lib/Driver/ToolChains.cpp
+@@ -839,6 +839,12 @@ DerivedArgList *Darwin::TranslateArgs(const DerivedArgList &Args,
+ }
+ }
+
++ // Default to use libc++ on OS X 10.9+ and iOS 7+.
++ if (((isTargetMacOS() && !isMacosxVersionLT(10, 9)) ||
++ (isTargetIPhoneOS() && !isIPhoneOSVersionLT(7, 0))) &&
++ !Args.getLastArg(options::OPT_stdlib_EQ))
++ DAL->AddJoinedArg(0, Opts.getOption(options::OPT_stdlib_EQ), "libc++");
++
+ // Validate the C++ standard library choice.
+ CXXStdlibType Type = GetCXXStdlibType(*DAL);
+ if (Type == ToolChain::CST_Libcxx) {
+diff --git a/test/PCH/cxx-typeid.cpp b/test/PCH/cxx-typeid.cpp
+index 534863a..6e62220 100644
+--- a/tools/clang/test/PCH/cxx-typeid.cpp
++++ b/tools/clang/test/PCH/cxx-typeid.cpp
+@@ -1,8 +1,8 @@
+ // Test this without pch.
+-// RUN: %clang_cc1 -include %S/cxx-typeid.h -fsyntax-only -verify %s
++// RUN: %clang_cc1 -include %S/cxx-typeid.h -fsyntax-only -stdlib=libstdc++ -verify %s
+
+-// RUN: %clang_cc1 -x c++-header -emit-pch -o %t.pch %S/cxx-typeid.h
+-// RUN: %clang_cc1 -include-pch %t.pch -fsyntax-only -verify %s
++// RUN: %clang_cc1 -x c++-header -emit-pch -stdlib=libstdc++ -o %t.pch %S/cxx-typeid.h
++// RUN: %clang_cc1 -include-pch %t.pch -fsyntax-only -stdlib=libstdc++ -verify %s
+
+ // expected-no-diagnostics
+
Modified: trunk/dports/lang/llvm-3.4/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.4/Portfile 2013-11-03 17:53:41 UTC (rev 112894)
+++ trunk/dports/lang/llvm-3.4/Portfile 2013-11-03 18:07:06 UTC (rev 112895)
@@ -49,7 +49,7 @@
}
fetch.type svn
-svn.revision 193358
+svn.revision 193941
set compiler_rt_rev ${svn.revision}
set libcxx_rev ${svn.revision}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131103/1c9abad8/attachment.html>
More information about the macports-changes
mailing list