[118971] trunk/dports/lang

jeremyhu at macports.org jeremyhu at macports.org
Sun Apr 13 22:17:37 PDT 2014


Revision: 118971
          https://trac.macports.org/changeset/118971
Author:   jeremyhu at macports.org
Date:     2014-04-13 22:17:37 -0700 (Sun, 13 Apr 2014)
Log Message:
-----------
llvm-*: libc++ STL fix for SL

Modified Paths:
--------------
    trunk/dports/lang/llvm-3.0/Portfile
    trunk/dports/lang/llvm-3.1/Portfile
    trunk/dports/lang/llvm-3.2/Portfile
    trunk/dports/lang/llvm-3.3/Portfile
    trunk/dports/lang/llvm-3.4/Portfile
    trunk/dports/lang/llvm-3.5/Portfile
    trunk/dports/lang/llvm-3.5/files/tiger-libclang.patch

Added Paths:
-----------
    trunk/dports/lang/llvm-3.0/files/snowleopard-cmath.patch
    trunk/dports/lang/llvm-3.1/files/snowleopard-cmath.patch
    trunk/dports/lang/llvm-3.2/files/snowleopard-cmath.patch
    trunk/dports/lang/llvm-3.3/files/snowleopard-cmath.patch
    trunk/dports/lang/llvm-3.4/files/snowleopard-cmath.patch
    trunk/dports/lang/llvm-3.5/files/snowleopard-cmath.patch

Modified: trunk/dports/lang/llvm-3.0/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.0/Portfile	2014-04-14 05:04:34 UTC (rev 118970)
+++ trunk/dports/lang/llvm-3.0/Portfile	2014-04-14 05:17:37 UTC (rev 118971)
@@ -101,7 +101,8 @@
     }
 
     patchfiles-append    tiger-shlib-clang.patch scan-build-PR-35006.patch \
-                         remove-chown-libcxx.patch
+                         remove-chown-libcxx.patch \
+                         snowleopard-cmath.patch
 
     build.target        clang-only
     destroot.target     install-clang

Added: trunk/dports/lang/llvm-3.0/files/snowleopard-cmath.patch
===================================================================
--- trunk/dports/lang/llvm-3.0/files/snowleopard-cmath.patch	                        (rev 0)
+++ trunk/dports/lang/llvm-3.0/files/snowleopard-cmath.patch	2014-04-14 05:17:37 UTC (rev 118971)
@@ -0,0 +1,25 @@
+--- a/projects/libcxx/include/cmath  2014-04-13 12:46:45.000000000 -0700
++++ b/projects/libcxx/include/cmath  2014-04-13 12:50:25.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__
++
+ #pragma GCC system_header
+ 
+ // signbit

Modified: trunk/dports/lang/llvm-3.1/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.1/Portfile	2014-04-14 05:04:34 UTC (rev 118970)
+++ trunk/dports/lang/llvm-3.1/Portfile	2014-04-14 05:17:37 UTC (rev 118971)
@@ -105,7 +105,8 @@
     }
 
     patchfiles-append    tiger-shlib-clang.patch tiger-libclang.patch scan-build-PR-35006.patch \
-                         0001-PR12597-Remove-chown-R-root-wheel-from-the-makefile.patch
+                         0001-PR12597-Remove-chown-R-root-wheel-from-the-makefile.patch \
+                         snowleopard-cmath.patch
 
     build.target        clang-only
     destroot.target     install-clang

Added: trunk/dports/lang/llvm-3.1/files/snowleopard-cmath.patch
===================================================================
--- trunk/dports/lang/llvm-3.1/files/snowleopard-cmath.patch	                        (rev 0)
+++ trunk/dports/lang/llvm-3.1/files/snowleopard-cmath.patch	2014-04-14 05:17:37 UTC (rev 118971)
@@ -0,0 +1,25 @@
+--- a/projects/libcxx/include/cmath	2014-04-13 12:26:04.000000000 -0700
++++ b/projects/libcxx/include/cmath	2014-04-13 12:26:44.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 _MSC_VER
+ #include "support/win32/math_win32.h"
+ #endif

Modified: trunk/dports/lang/llvm-3.2/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.2/Portfile	2014-04-14 05:04:34 UTC (rev 118970)
+++ trunk/dports/lang/llvm-3.2/Portfile	2014-04-14 05:17:37 UTC (rev 118971)
@@ -107,7 +107,8 @@
                          0001-Comment-out-SL-cctools-workaround.patch \
                          asan-pthread_workqueue.patch \
                          0002-PR12597-Remove-chown-R-root-wheel-from-the-makefile.patch \
-                         mavericks-libc++.patch
+                         mavericks-libc++.patch \
+                         snowleopard-cmath.patch
 
     build.target        clang-only
     destroot.target     install-clang

Added: trunk/dports/lang/llvm-3.2/files/snowleopard-cmath.patch
===================================================================
--- trunk/dports/lang/llvm-3.2/files/snowleopard-cmath.patch	                        (rev 0)
+++ trunk/dports/lang/llvm-3.2/files/snowleopard-cmath.patch	2014-04-14 05:17:37 UTC (rev 118971)
@@ -0,0 +1,25 @@
+--- a/projects/libcxx/include/cmath	2014-04-13 12:26:04.000000000 -0700
++++ b/projects/libcxx/include/cmath	2014-04-13 12:26:44.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 _MSC_VER
+ #include "support/win32/math_win32.h"
+ #endif

Modified: trunk/dports/lang/llvm-3.3/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.3/Portfile	2014-04-14 05:04:34 UTC (rev 118970)
+++ trunk/dports/lang/llvm-3.3/Portfile	2014-04-14 05:17:37 UTC (rev 118971)
@@ -94,7 +94,8 @@
 
     patchfiles-append    tiger-shlib-clang.patch tiger-libclang.patch scan-build-PR-35006.patch \
                          0001-Comment-out-SL-cctools-workaround.patch \
-                         mavericks-libc++.patch
+                         mavericks-libc++.patch \
+                         snowleopard-cmath.patch
 
     build.target        clang-only
     destroot.target     install-clang

Added: trunk/dports/lang/llvm-3.3/files/snowleopard-cmath.patch
===================================================================
--- trunk/dports/lang/llvm-3.3/files/snowleopard-cmath.patch	                        (rev 0)
+++ trunk/dports/lang/llvm-3.3/files/snowleopard-cmath.patch	2014-04-14 05:17:37 UTC (rev 118971)
@@ -0,0 +1,25 @@
+--- a/projects/libcxx/include/cmath	2014-04-13 12:26:04.000000000 -0700
++++ b/projects/libcxx/include/cmath	2014-04-13 12:26:44.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 _MSC_VER
+ #include "support/win32/math_win32.h"
+ #endif

Modified: trunk/dports/lang/llvm-3.4/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.4/Portfile	2014-04-14 05:04:34 UTC (rev 118970)
+++ trunk/dports/lang/llvm-3.4/Portfile	2014-04-14 05:17:37 UTC (rev 118971)
@@ -104,7 +104,8 @@
 
 if {${subport} == "clang-${llvm_version}"} {
     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 \
+                         snowleopard-cmath.patch
 
     build.target        clang-only
     destroot.target     install-clang

Added: trunk/dports/lang/llvm-3.4/files/snowleopard-cmath.patch
===================================================================
--- trunk/dports/lang/llvm-3.4/files/snowleopard-cmath.patch	                        (rev 0)
+++ trunk/dports/lang/llvm-3.4/files/snowleopard-cmath.patch	2014-04-14 05:17:37 UTC (rev 118971)
@@ -0,0 +1,25 @@
+--- 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.5/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.5/Portfile	2014-04-14 05:04:34 UTC (rev 118970)
+++ trunk/dports/lang/llvm-3.5/Portfile	2014-04-14 05:17:37 UTC (rev 118971)
@@ -86,8 +86,9 @@
 patch.pre_args  -p1
 
 if {${subport} == "clang-${llvm_version}"} {
-    patchfiles-append    tiger-libclang.patch scan-build-PR-35006.patch \
-                         0001-Comment-out-SL-cctools-workaround.patch
+    patchfiles-append    scan-build-PR-35006.patch \
+                         0001-Comment-out-SL-cctools-workaround.patch \
+                         snowleopard-cmath.patch
 
     build.target        clang-only
     destroot.target     install-clang

Added: trunk/dports/lang/llvm-3.5/files/snowleopard-cmath.patch
===================================================================
--- trunk/dports/lang/llvm-3.5/files/snowleopard-cmath.patch	                        (rev 0)
+++ trunk/dports/lang/llvm-3.5/files/snowleopard-cmath.patch	2014-04-14 05:17:37 UTC (rev 118971)
@@ -0,0 +1,25 @@
+--- 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.5/files/tiger-libclang.patch
===================================================================
--- trunk/dports/lang/llvm-3.5/files/tiger-libclang.patch	2014-04-14 05:04:34 UTC (rev 118970)
+++ trunk/dports/lang/llvm-3.5/files/tiger-libclang.patch	2014-04-14 05:17:37 UTC (rev 118971)
@@ -1,11 +0,0 @@
---- a/tools/clang/tools/libclang/CIndex.cpp.orig	2012-04-01 22:38:40.000000000 -0700
-+++ b/tools/clang/tools/libclang/CIndex.cpp	2012-04-01 22:39:17.000000000 -0700
-@@ -5754,7 +5754,7 @@ void SetSafetyThreadStackSize(unsigned V
- 
- void clang::setThreadBackgroundPriority() {
-   // FIXME: Move to llvm/Support and make it cross-platform.
--#ifdef __APPLE__
-+#if defined(__APPLE__) && defined(PRIO_DARWIN_THREAD) && defined(PRIO_DARWIN_BG)
-   setpriority(PRIO_DARWIN_THREAD, 0, PRIO_DARWIN_BG);
- #endif
- }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140413/e8ba7c5e/attachment-0001.html>


More information about the macports-changes mailing list