[92059] trunk/dports/lang
jeremyhu at macports.org
jeremyhu at macports.org
Mon Apr 16 17:42:57 PDT 2012
Revision: 92059
https://trac.macports.org/changeset/92059
Author: jeremyhu at macports.org
Date: 2012-04-16 17:42:56 -0700 (Mon, 16 Apr 2012)
Log Message:
-----------
{clang,llvm}-{2.9,3.0}: Address a possible build failure with strict C++ compilers
Modified Paths:
--------------
trunk/dports/lang/clang-2.9/Portfile
trunk/dports/lang/clang-3.0/Portfile
trunk/dports/lang/llvm-2.9/Portfile
trunk/dports/lang/llvm-3.0/Portfile
Added Paths:
-----------
trunk/dports/lang/clang-2.9/files/0001-Add-a-few-missing-template-keywords.patch
trunk/dports/lang/clang-3.0/files/0001-Add-a-few-missing-template-keywords.patch
trunk/dports/lang/llvm-2.9/files/0001-Add-a-few-missing-template-keywords.patch
trunk/dports/lang/llvm-3.0/files/0001-Add-a-few-missing-template-keywords.patch
Modified: trunk/dports/lang/clang-2.9/Portfile
===================================================================
--- trunk/dports/lang/clang-2.9/Portfile 2012-04-17 00:05:07 UTC (rev 92058)
+++ trunk/dports/lang/clang-2.9/Portfile 2012-04-17 00:42:56 UTC (rev 92059)
@@ -57,7 +57,8 @@
sha256 70c41f3f782a71cbaa7bc8d6ea29fce4263ad3e8558dfecc6dc11cdef17909df
patchfiles install_target.patch \
- tiger-shlib.patch
+ tiger-shlib.patch \
+ 0001-Add-a-few-missing-template-keywords.patch
patch.pre_args -p1
build.target clang-only
Added: trunk/dports/lang/clang-2.9/files/0001-Add-a-few-missing-template-keywords.patch
===================================================================
--- trunk/dports/lang/clang-2.9/files/0001-Add-a-few-missing-template-keywords.patch (rev 0)
+++ trunk/dports/lang/clang-2.9/files/0001-Add-a-few-missing-template-keywords.patch 2012-04-17 00:42:56 UTC (rev 92059)
@@ -0,0 +1,49 @@
+From 87d8e60505b26960956996550c8b805c81e5b02b Mon Sep 17 00:00:00 2001
+From: Douglas Gregor <dgregor at apple.com>
+Date: Sun, 11 Mar 2012 02:22:41 +0000
+Subject: [PATCH] Add a few missing 'template' keywords
+
+git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@152525 91177308-0d34-0410-b5e6-96231b3b80d8
+---
+ include/llvm/ADT/IntervalMap.h | 2 +-
+ include/llvm/ADT/PointerUnion.h | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/include/llvm/ADT/IntervalMap.h b/include/llvm/ADT/IntervalMap.h
+index 83e225c..931b67e 100644
+--- a/include/llvm/ADT/IntervalMap.h
++++ b/include/llvm/ADT/IntervalMap.h
+@@ -1977,7 +1977,7 @@ iterator::overflow(unsigned Level) {
+ CurSize[Nodes] = CurSize[NewNode];
+ Node[Nodes] = Node[NewNode];
+ CurSize[NewNode] = 0;
+- Node[NewNode] = this->map->newNode<NodeT>();
++ Node[NewNode] = this->map->template newNode<NodeT>();
+ ++Nodes;
+ }
+
+diff --git a/include/llvm/ADT/PointerUnion.h b/include/llvm/ADT/PointerUnion.h
+index 036cf60..614b59c 100644
+--- a/include/llvm/ADT/PointerUnion.h
++++ b/include/llvm/ADT/PointerUnion.h
+@@ -266,7 +266,7 @@ namespace llvm {
+ ::llvm::PointerUnionTypeSelector<PT1, T, IsInnerUnion,
+ ::llvm::PointerUnionTypeSelector<PT2, T, IsInnerUnion, IsPT3 >
+ >::Return Ty;
+- return Ty(Val).is<T>();
++ return Ty(Val).template is<T>();
+ }
+
+ /// get<T>() - Return the value of the specified pointer type. If the
+@@ -279,7 +279,7 @@ namespace llvm {
+ ::llvm::PointerUnionTypeSelector<PT1, T, IsInnerUnion,
+ ::llvm::PointerUnionTypeSelector<PT2, T, IsInnerUnion, IsPT3 >
+ >::Return Ty;
+- return Ty(Val).get<T>();
++ return Ty(Val).template get<T>();
+ }
+
+ /// dyn_cast<T>() - If the current value is of the specified pointer type,
+--
+1.7.10
+
Modified: trunk/dports/lang/clang-3.0/Portfile
===================================================================
--- trunk/dports/lang/clang-3.0/Portfile 2012-04-17 00:05:07 UTC (rev 92058)
+++ trunk/dports/lang/clang-3.0/Portfile 2012-04-17 00:42:56 UTC (rev 92059)
@@ -57,7 +57,8 @@
sha256 b64e72da356d7c3428cfd7ac620d49ec042c84eaee13c26024879f555f4e126d
patchfiles install_target.patch \
- tiger-shlib.patch
+ tiger-shlib.patch \
+ 0001-Add-a-few-missing-template-keywords.patch
patch.pre_args -p1
build.target clang-only
Added: trunk/dports/lang/clang-3.0/files/0001-Add-a-few-missing-template-keywords.patch
===================================================================
--- trunk/dports/lang/clang-3.0/files/0001-Add-a-few-missing-template-keywords.patch (rev 0)
+++ trunk/dports/lang/clang-3.0/files/0001-Add-a-few-missing-template-keywords.patch 2012-04-17 00:42:56 UTC (rev 92059)
@@ -0,0 +1,49 @@
+From 87d8e60505b26960956996550c8b805c81e5b02b Mon Sep 17 00:00:00 2001
+From: Douglas Gregor <dgregor at apple.com>
+Date: Sun, 11 Mar 2012 02:22:41 +0000
+Subject: [PATCH] Add a few missing 'template' keywords
+
+git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@152525 91177308-0d34-0410-b5e6-96231b3b80d8
+---
+ include/llvm/ADT/IntervalMap.h | 2 +-
+ include/llvm/ADT/PointerUnion.h | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/include/llvm/ADT/IntervalMap.h b/include/llvm/ADT/IntervalMap.h
+index 83e225c..931b67e 100644
+--- a/include/llvm/ADT/IntervalMap.h
++++ b/include/llvm/ADT/IntervalMap.h
+@@ -1977,7 +1977,7 @@ iterator::overflow(unsigned Level) {
+ CurSize[Nodes] = CurSize[NewNode];
+ Node[Nodes] = Node[NewNode];
+ CurSize[NewNode] = 0;
+- Node[NewNode] = this->map->newNode<NodeT>();
++ Node[NewNode] = this->map->template newNode<NodeT>();
+ ++Nodes;
+ }
+
+diff --git a/include/llvm/ADT/PointerUnion.h b/include/llvm/ADT/PointerUnion.h
+index 036cf60..614b59c 100644
+--- a/include/llvm/ADT/PointerUnion.h
++++ b/include/llvm/ADT/PointerUnion.h
+@@ -266,7 +266,7 @@ namespace llvm {
+ ::llvm::PointerUnionTypeSelector<PT1, T, IsInnerUnion,
+ ::llvm::PointerUnionTypeSelector<PT2, T, IsInnerUnion, IsPT3 >
+ >::Return Ty;
+- return Ty(Val).is<T>();
++ return Ty(Val).template is<T>();
+ }
+
+ /// get<T>() - Return the value of the specified pointer type. If the
+@@ -279,7 +279,7 @@ namespace llvm {
+ ::llvm::PointerUnionTypeSelector<PT1, T, IsInnerUnion,
+ ::llvm::PointerUnionTypeSelector<PT2, T, IsInnerUnion, IsPT3 >
+ >::Return Ty;
+- return Ty(Val).get<T>();
++ return Ty(Val).template get<T>();
+ }
+
+ /// dyn_cast<T>() - If the current value is of the specified pointer type,
+--
+1.7.10
+
Modified: trunk/dports/lang/llvm-2.9/Portfile
===================================================================
--- trunk/dports/lang/llvm-2.9/Portfile 2012-04-17 00:05:07 UTC (rev 92058)
+++ trunk/dports/lang/llvm-2.9/Portfile 2012-04-17 00:42:56 UTC (rev 92059)
@@ -43,7 +43,8 @@
rmd160 caeaa067fda1eb34196b356a087645f83731cfb7 \
sha256 661236cfa17428b48cfa9cbb9909f7569c64b8ecd219fd91dbc00e3b557b3779
-patchfiles tiger-shlib.patch
+patchfiles tiger-shlib.patch \
+ 0001-Add-a-few-missing-template-keywords.patch
patch.pre_args -p1
build.env-append VERBOSE=1 REQUIRE_RTTI=1
Added: trunk/dports/lang/llvm-2.9/files/0001-Add-a-few-missing-template-keywords.patch
===================================================================
--- trunk/dports/lang/llvm-2.9/files/0001-Add-a-few-missing-template-keywords.patch (rev 0)
+++ trunk/dports/lang/llvm-2.9/files/0001-Add-a-few-missing-template-keywords.patch 2012-04-17 00:42:56 UTC (rev 92059)
@@ -0,0 +1,49 @@
+From 87d8e60505b26960956996550c8b805c81e5b02b Mon Sep 17 00:00:00 2001
+From: Douglas Gregor <dgregor at apple.com>
+Date: Sun, 11 Mar 2012 02:22:41 +0000
+Subject: [PATCH] Add a few missing 'template' keywords
+
+git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@152525 91177308-0d34-0410-b5e6-96231b3b80d8
+---
+ include/llvm/ADT/IntervalMap.h | 2 +-
+ include/llvm/ADT/PointerUnion.h | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/include/llvm/ADT/IntervalMap.h b/include/llvm/ADT/IntervalMap.h
+index 83e225c..931b67e 100644
+--- a/include/llvm/ADT/IntervalMap.h
++++ b/include/llvm/ADT/IntervalMap.h
+@@ -1977,7 +1977,7 @@ iterator::overflow(unsigned Level) {
+ CurSize[Nodes] = CurSize[NewNode];
+ Node[Nodes] = Node[NewNode];
+ CurSize[NewNode] = 0;
+- Node[NewNode] = this->map->newNode<NodeT>();
++ Node[NewNode] = this->map->template newNode<NodeT>();
+ ++Nodes;
+ }
+
+diff --git a/include/llvm/ADT/PointerUnion.h b/include/llvm/ADT/PointerUnion.h
+index 036cf60..614b59c 100644
+--- a/include/llvm/ADT/PointerUnion.h
++++ b/include/llvm/ADT/PointerUnion.h
+@@ -266,7 +266,7 @@ namespace llvm {
+ ::llvm::PointerUnionTypeSelector<PT1, T, IsInnerUnion,
+ ::llvm::PointerUnionTypeSelector<PT2, T, IsInnerUnion, IsPT3 >
+ >::Return Ty;
+- return Ty(Val).is<T>();
++ return Ty(Val).template is<T>();
+ }
+
+ /// get<T>() - Return the value of the specified pointer type. If the
+@@ -279,7 +279,7 @@ namespace llvm {
+ ::llvm::PointerUnionTypeSelector<PT1, T, IsInnerUnion,
+ ::llvm::PointerUnionTypeSelector<PT2, T, IsInnerUnion, IsPT3 >
+ >::Return Ty;
+- return Ty(Val).get<T>();
++ return Ty(Val).template get<T>();
+ }
+
+ /// dyn_cast<T>() - If the current value is of the specified pointer type,
+--
+1.7.10
+
Modified: trunk/dports/lang/llvm-3.0/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.0/Portfile 2012-04-17 00:05:07 UTC (rev 92058)
+++ trunk/dports/lang/llvm-3.0/Portfile 2012-04-17 00:42:56 UTC (rev 92059)
@@ -43,7 +43,8 @@
rmd160 85211cafbed1c5d838ac54669017b5298613f975 \
sha256 519eb11d3499ce99c6ffdb8718651fc91425ed7690eac91c8d6853474f7c0477
-patchfiles tiger-shlib.patch
+patchfiles tiger-shlib.patch \
+ 0001-Add-a-few-missing-template-keywords.patch
patch.pre_args -p1
build.env-append VERBOSE=1 REQUIRE_RTTI=1
Added: trunk/dports/lang/llvm-3.0/files/0001-Add-a-few-missing-template-keywords.patch
===================================================================
--- trunk/dports/lang/llvm-3.0/files/0001-Add-a-few-missing-template-keywords.patch (rev 0)
+++ trunk/dports/lang/llvm-3.0/files/0001-Add-a-few-missing-template-keywords.patch 2012-04-17 00:42:56 UTC (rev 92059)
@@ -0,0 +1,49 @@
+From 87d8e60505b26960956996550c8b805c81e5b02b Mon Sep 17 00:00:00 2001
+From: Douglas Gregor <dgregor at apple.com>
+Date: Sun, 11 Mar 2012 02:22:41 +0000
+Subject: [PATCH] Add a few missing 'template' keywords
+
+git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@152525 91177308-0d34-0410-b5e6-96231b3b80d8
+---
+ include/llvm/ADT/IntervalMap.h | 2 +-
+ include/llvm/ADT/PointerUnion.h | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/include/llvm/ADT/IntervalMap.h b/include/llvm/ADT/IntervalMap.h
+index 83e225c..931b67e 100644
+--- a/include/llvm/ADT/IntervalMap.h
++++ b/include/llvm/ADT/IntervalMap.h
+@@ -1977,7 +1977,7 @@ iterator::overflow(unsigned Level) {
+ CurSize[Nodes] = CurSize[NewNode];
+ Node[Nodes] = Node[NewNode];
+ CurSize[NewNode] = 0;
+- Node[NewNode] = this->map->newNode<NodeT>();
++ Node[NewNode] = this->map->template newNode<NodeT>();
+ ++Nodes;
+ }
+
+diff --git a/include/llvm/ADT/PointerUnion.h b/include/llvm/ADT/PointerUnion.h
+index 036cf60..614b59c 100644
+--- a/include/llvm/ADT/PointerUnion.h
++++ b/include/llvm/ADT/PointerUnion.h
+@@ -266,7 +266,7 @@ namespace llvm {
+ ::llvm::PointerUnionTypeSelector<PT1, T, IsInnerUnion,
+ ::llvm::PointerUnionTypeSelector<PT2, T, IsInnerUnion, IsPT3 >
+ >::Return Ty;
+- return Ty(Val).is<T>();
++ return Ty(Val).template is<T>();
+ }
+
+ /// get<T>() - Return the value of the specified pointer type. If the
+@@ -279,7 +279,7 @@ namespace llvm {
+ ::llvm::PointerUnionTypeSelector<PT1, T, IsInnerUnion,
+ ::llvm::PointerUnionTypeSelector<PT2, T, IsInnerUnion, IsPT3 >
+ >::Return Ty;
+- return Ty(Val).get<T>();
++ return Ty(Val).template get<T>();
+ }
+
+ /// dyn_cast<T>() - If the current value is of the specified pointer type,
+--
+1.7.10
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120416/5ed3b073/attachment.html>
More information about the macports-changes
mailing list