[113436] trunk/dports/lang

jeremyhu at macports.org jeremyhu at macports.org
Fri Nov 15 17:06:21 PST 2013


Revision: 113436
          https://trac.macports.org/changeset/113436
Author:   jeremyhu at macports.org
Date:     2013-11-15 17:06:21 -0800 (Fri, 15 Nov 2013)
Log Message:
-----------
{clang,dragonegg,llvm}-3.2: Allow install on Mavericks

Modified Paths:
--------------
    trunk/dports/lang/dragonegg-3.2/Portfile
    trunk/dports/lang/llvm-3.2/Portfile

Added Paths:
-----------
    trunk/dports/lang/llvm-3.2/files/mavericks-libc++.patch

Modified: trunk/dports/lang/dragonegg-3.2/Portfile
===================================================================
--- trunk/dports/lang/dragonegg-3.2/Portfile	2013-11-16 01:04:07 UTC (rev 113435)
+++ trunk/dports/lang/dragonegg-3.2/Portfile	2013-11-16 01:06:21 UTC (rev 113436)
@@ -84,11 +84,11 @@
                     sha256  6f19a1925147a1c9a0ecb6c5bf49cbdfbb65f904d5dcf737cded9c303c86dd49
 
 platform darwin {
-    if {${os.major} >= 13} {
+    if {${os.major} >= 14} {
         depends_lib
         depends_run
         pre-fetch {
-            ui_error "$name is not supported on Mavericks or later."
+            ui_error "$name is not supported after Mavericks."
             error "unsupported platform"
         }
     }

Modified: trunk/dports/lang/llvm-3.2/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.2/Portfile	2013-11-16 01:04:07 UTC (rev 113435)
+++ trunk/dports/lang/llvm-3.2/Portfile	2013-11-16 01:06:21 UTC (rev 113436)
@@ -16,11 +16,11 @@
 maintainers             jeremyhu
 
 platform darwin {
-    if {${os.major} >= 13} {
+    if {${os.major} >= 14} {
         depends_lib
         depends_run
         pre-fetch {
-            ui_error "$name is not supported on Mavericks or later."
+            ui_error "$name is not supported after Mavericks."
             error "unsupported platform"
         }
     }
@@ -106,7 +106,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

Added: trunk/dports/lang/llvm-3.2/files/mavericks-libc++.patch
===================================================================
--- trunk/dports/lang/llvm-3.2/files/mavericks-libc++.patch	                        (rev 0)
+++ trunk/dports/lang/llvm-3.2/files/mavericks-libc++.patch	2013-11-16 01:06:21 UTC (rev 113436)
@@ -0,0 +1,25 @@
+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) {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131115/65c57ef0/attachment.html>


More information about the macports-changes mailing list