[87053] trunk/dports/devel/grantlee

[ryandesign at macports.org]

Revision: 87053
          http://trac.macports.org/changeset/87053
Author:   ryandesign at macports.org
Date:     2011-11-08 10:55:36 -0800 (Tue, 08 Nov 2011)
Log Message:
-----------
grantlee: fix build with gcc-4.0; see #31219

Modified Paths:
--------------
    trunk/dports/devel/grantlee/Portfile

Added Paths:
-----------
    trunk/dports/devel/grantlee/files/
    trunk/dports/devel/grantlee/files/0001-Test-for-working-tr1-unordered_map.diff

Modified: trunk/dports/devel/grantlee/Portfile
===================================================================
--- trunk/dports/devel/grantlee/Portfile	2011-11-08 18:32:32 UTC (rev 87052)
+++ trunk/dports/devel/grantlee/Portfile	2011-11-08 18:55:36 UTC (rev 87053)
@@ -18,5 +18,8 @@
 checksums           rmd160  14ac226fcfff07cef7bc43ef971f1a819284a7ec \
                     sha256  43a6256b46a14cc12a2a6bdbe300f1c5ab52abd0cb6ba357db4580148bddd474
 
+patch.pre_args      -p1
+patchfiles          0001-Test-for-working-tr1-unordered_map.diff
+
 livecheck.url       http://downloads.grantlee.org/
 livecheck.regex     "${name}-(\\d+(?:\\.\\d+)*)${extract.suffix}"

Added: trunk/dports/devel/grantlee/files/0001-Test-for-working-tr1-unordered_map.diff
===================================================================
--- trunk/dports/devel/grantlee/files/0001-Test-for-working-tr1-unordered_map.diff	                        (rev 0)
+++ trunk/dports/devel/grantlee/files/0001-Test-for-working-tr1-unordered_map.diff	2011-11-08 18:55:36 UTC (rev 87053)
@@ -0,0 +1,42 @@
+From 41a771b7470bb61ca8fa98f1428b43b5e06592ba Mon Sep 17 00:00:00 2001
+From: Stephen Kelly <steveire at gmail.com>
+Date: Sun, 6 Nov 2011 17:49:37 +0100
+Subject: [PATCH] Test for working tr1/unordered_map.
+
+On Apple Leopard, the assignment operator and copy constructor don't work
+for that class.
+---
+ templates/tests/CMakeLists.txt |   17 ++++++++++++++++-
+ 1 files changed, 16 insertions(+), 1 deletions(-)
+
+diff --git a/templates/tests/CMakeLists.txt b/templates/tests/CMakeLists.txt
+index caab003..d2e37d2 100644
+--- a/templates/tests/CMakeLists.txt
++++ b/templates/tests/CMakeLists.txt
+@@ -12,7 +12,22 @@ check_include_file_cxx("tr1/unordered_map" HAVE_TR1_UNORDERED_MAP)
+ check_include_file_cxx("tr1/array" HAVE_TR1_ARRAY)
+ check_include_file_cxx("tr1/memory" HAVE_TR1_MEMORY)
+ 
+-if(NOT HAVE_TR1_UNORDERED_MAP OR NOT HAVE_TR1_ARRAY OR NOT HAVE_TR1_MEMORY)
++check_cxx_source_compiles("
++
++#include <tr1/unordered_map>
++
++typedef std::tr1::unordered_map<int, int> std_unordered_mapintint;
++
++int main(int, char **)
++{
++  std_unordered_mapintint m1;
++  std_unordered_mapintint m2(m1);
++  return 0;
++}
++
++" HAVE_WORKING_TR1_UNORDERED_MAP)
++
++if(NOT HAVE_TR1_UNORDERED_MAP OR NOT HAVE_TR1_ARRAY OR NOT HAVE_TR1_MEMORY OR NOT HAVE_WORKING_TR1_UNORDERED_MAP)
+   message(STATUS "Not enabling TR1 container tests")
+   set(GRANTLEE_NO_TR1 True)
+ else()
+-- 
+1.7.5.4
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111108/3fc4c8e5/attachment-0001.html>