[107898] trunk/dports/lang/llvm-2.9
larryv at macports.org
larryv at macports.org
Mon Jul 8 13:18:17 PDT 2013
Revision: 107898
https://trac.macports.org/changeset/107898
Author: larryv at macports.org
Date: 2013-07-08 13:18:17 -0700 (Mon, 08 Jul 2013)
Log Message:
-----------
{llvm,clang}-2.9: Use upstream patches to provide context.
Modified Paths:
--------------
trunk/dports/lang/llvm-2.9/Portfile
Added Paths:
-----------
trunk/dports/lang/llvm-2.9/files/0002-include-clang-AST-StmtIterator.h-std-pair-should-be-.patch
trunk/dports/lang/llvm-2.9/files/0003-Include-pthread.h-before-we-use-pthread_self-pthread.patch
Removed Paths:
-------------
trunk/dports/lang/llvm-2.9/files/missing-includes.patch
trunk/dports/lang/llvm-2.9/files/pthread.patch
Modified: trunk/dports/lang/llvm-2.9/Portfile
===================================================================
--- trunk/dports/lang/llvm-2.9/Portfile 2013-07-08 20:11:41 UTC (rev 107897)
+++ trunk/dports/lang/llvm-2.9/Portfile 2013-07-08 20:18:17 UTC (rev 107898)
@@ -92,7 +92,7 @@
patchfiles install_target.patch \
0001-Add-a-few-missing-template-keywords.patch \
tiger-shlib.patch \
- pthread.patch
+ 0003-Include-pthread.h-before-we-use-pthread_self-pthread.patch
patch.pre_args -p1
@@ -101,7 +101,9 @@
distfiles-append clang-${version}${extract.suffix}
}
- patchfiles-append tiger-shlib-clang.patch scan-build-PR-35006.patch missing-includes.patch
+ patchfiles-append tiger-shlib-clang.patch \
+ scan-build-PR-35006.patch \
+ 0002-include-clang-AST-StmtIterator.h-std-pair-should-be-.patch
build.target clang-only
destroot.target install-clang
Copied: trunk/dports/lang/llvm-2.9/files/0002-include-clang-AST-StmtIterator.h-std-pair-should-be-.patch (from rev 107893, trunk/dports/lang/llvm-2.9/files/missing-includes.patch)
===================================================================
--- trunk/dports/lang/llvm-2.9/files/0002-include-clang-AST-StmtIterator.h-std-pair-should-be-.patch (rev 0)
+++ trunk/dports/lang/llvm-2.9/files/0002-include-clang-AST-StmtIterator.h-std-pair-should-be-.patch 2013-07-08 20:18:17 UTC (rev 107898)
@@ -0,0 +1,26 @@
+From 7a3a8148ab21dba3965622b03969bae721d561e2 Mon Sep 17 00:00:00 2001
+From: NAKAMURA Takumi <geek4civic at gmail.com>
+Date: Tue, 26 Apr 2011 03:17:13 +0000
+Subject: [PATCH] include/clang/AST/StmtIterator.h: std::pair should be
+ provided by <utility>. libcxx needs it.
+
+git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@130183 91177308-0d34-0410-b5e6-96231b3b80d8
+---
+ include/clang/AST/StmtIterator.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tools/clang/include/clang/AST/StmtIterator.h b/tools/clang/include/clang/AST/StmtIterator.h
+index 851c001..05b50db 100644
+--- a/tools/clang/include/clang/AST/StmtIterator.h
++++ b/tools/clang/include/clang/AST/StmtIterator.h
+@@ -18,6 +18,7 @@
+ #include <cassert>
+ #include <cstddef>
+ #include <iterator>
++#include <utility>
+
+ namespace clang {
+
+--
+1.8.3.1
+
Copied: trunk/dports/lang/llvm-2.9/files/0003-Include-pthread.h-before-we-use-pthread_self-pthread.patch (from rev 107893, trunk/dports/lang/llvm-2.9/files/pthread.patch)
===================================================================
--- trunk/dports/lang/llvm-2.9/files/0003-Include-pthread.h-before-we-use-pthread_self-pthread.patch (rev 0)
+++ trunk/dports/lang/llvm-2.9/files/0003-Include-pthread.h-before-we-use-pthread_self-pthread.patch 2013-07-08 20:18:17 UTC (rev 107898)
@@ -0,0 +1,37 @@
+From 72d30f6950f48c7bec29e6b3c955784992304bae Mon Sep 17 00:00:00 2001
+From: Douglas Gregor <dgregor at apple.com>
+Date: Fri, 29 Apr 2011 16:12:17 +0000
+Subject: [PATCH] Include <pthread.h> before we use pthread_self/pthread_kill
+
+git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@130510 91177308-0d34-0410-b5e6-96231b3b80d8
+---
+ lib/Support/Unix/Signals.inc | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/lib/Support/Unix/Signals.inc b/lib/Support/Unix/Signals.inc
+index fade906..e286869 100644
+--- a/lib/Support/Unix/Signals.inc
++++ b/lib/Support/Unix/Signals.inc
+@@ -274,6 +274,9 @@ void llvm::sys::PrintStackTraceOnErrorSignal() {
+
+ #ifdef __APPLE__
+
++#include <signal.h>
++#include <pthread.h>
++
+ int raise(int sig) {
+ return pthread_kill(pthread_self(), sig);
+ }
+@@ -291,9 +294,6 @@ void __assert_rtn(const char *func,
+ abort();
+ }
+
+-#include <signal.h>
+-#include <pthread.h>
+-
+ void abort() {
+ raise(SIGABRT);
+ usleep(1000);
+--
+1.8.3.1
+
Deleted: trunk/dports/lang/llvm-2.9/files/missing-includes.patch
===================================================================
--- trunk/dports/lang/llvm-2.9/files/missing-includes.patch 2013-07-08 20:11:41 UTC (rev 107897)
+++ trunk/dports/lang/llvm-2.9/files/missing-includes.patch 2013-07-08 20:18:17 UTC (rev 107898)
@@ -1,10 +0,0 @@
---- ./tools/clang/include/clang/AST/StmtIterator.h.orig 2013-01-06 14:40:50.000000000 -0800
-+++ ./tools/clang/include/clang/AST/StmtIterator.h 2013-01-06 14:41:00.000000000 -0800
-@@ -18,6 +18,7 @@
- #include <cassert>
- #include <cstddef>
- #include <iterator>
-+#include <utility>
-
- namespace clang {
-
Deleted: trunk/dports/lang/llvm-2.9/files/pthread.patch
===================================================================
--- trunk/dports/lang/llvm-2.9/files/pthread.patch 2013-07-08 20:11:41 UTC (rev 107897)
+++ trunk/dports/lang/llvm-2.9/files/pthread.patch 2013-07-08 20:18:17 UTC (rev 107898)
@@ -1,12 +0,0 @@
---- a/lib/Support/Unix/Signals.inc.orig 2013-01-02 15:32:07.000000000 -0800
-+++ b/lib/Support/Unix/Signals.inc 2013-01-02 15:32:26.000000000 -0800
-@@ -30,6 +30,9 @@
- #include <dlfcn.h>
- #include <cxxabi.h>
- #endif
-+
-+#include <pthread.h>
-+
- using namespace llvm;
-
- static RETSIGTYPE SignalHandler(int Sig); // defined below.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130708/c4021618/attachment-0001.html>
More information about the macports-changes
mailing list