[95086] trunk/dports/devel/nusmv

[jmr at macports.org]

Revision: 95086
          https://trac.macports.org/changeset/95086
Author:   jmr at macports.org
Date:     2012-07-05 09:11:22 -0700 (Thu, 05 Jul 2012)
Log Message:
-----------
nusmv: fix incorrect C++ instead of not using clang (#32600)

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

Added Paths:
-----------
    trunk/dports/devel/nusmv/files/
    trunk/dports/devel/nusmv/files/MiniSat_minisat_core_SolverTypes.h.diff

Modified: trunk/dports/devel/nusmv/Portfile
===================================================================
--- trunk/dports/devel/nusmv/Portfile	2012-07-05 08:53:16 UTC (rev 95085)
+++ trunk/dports/devel/nusmv/Portfile	2012-07-05 16:11:22 UTC (rev 95086)
@@ -34,9 +34,7 @@
     system -W ${minisatdir} "unzip ${distpath}/minisat2-070721.zip"
 }
 
-if {${configure.compiler} == "clang"} {
-    configure.compiler llvm-gcc-4.2
-}
+patchfiles          MiniSat_minisat_core_SolverTypes.h.diff
 
 pre-configure {
     # build included cudd first so that configure can pick it up

Added: trunk/dports/devel/nusmv/files/MiniSat_minisat_core_SolverTypes.h.diff
===================================================================
--- trunk/dports/devel/nusmv/files/MiniSat_minisat_core_SolverTypes.h.diff	                        (rev 0)
+++ trunk/dports/devel/nusmv/files/MiniSat_minisat_core_SolverTypes.h.diff	2012-07-05 16:11:22 UTC (rev 95086)
@@ -0,0 +1,28 @@
+--- MiniSat/minisat/core/SolverTypes.h.orig	2006-11-11 08:54:30.000000000 +1100
++++ MiniSat/minisat/core/SolverTypes.h	2012-07-06 01:55:39.000000000 +1000
+@@ -119,11 +119,7 @@ public:
+ 
+     // -- use this function instead:
+     template<class V>
+-    friend Clause* Clause_new(const V& ps, bool learnt = false) {
+-        assert(sizeof(Lit)      == sizeof(uint32_t));
+-        assert(sizeof(float)    == sizeof(uint32_t));
+-        void* mem = malloc(sizeof(Clause) + sizeof(uint32_t)*(ps.size()));
+-        return new (mem) Clause(ps, learnt); }
++    friend Clause* Clause_new(const V& ps, bool learnt = false);
+ 
+     int          size        ()      const   { return size_etc >> 3; }
+     void         shrink      (int i)         { assert(i <= size()); size_etc = (((size_etc >> 3) - i) << 3) | (size_etc & 7); }
+@@ -146,6 +142,12 @@ public:
+     void         strengthen  (Lit p);
+ };
+ 
++template<class V> Clause* Clause_new(const V& ps, bool learnt) {
++        assert(sizeof(Lit)      == sizeof(uint32_t));
++        assert(sizeof(float)    == sizeof(uint32_t));
++        void* mem = malloc(sizeof(Clause) + sizeof(uint32_t)*(ps.size()));
++        return new (mem) Clause(ps, learnt);
++}
+ 
+ /*_________________________________________________________________________________________________
+ |
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120705/36bde651/attachment.html>