[83707] trunk/dports/devel/nusmv/Portfile

[mww at macports.org]

Revision: 83707
          http://trac.macports.org/changeset/83707
Author:   mww at macports.org
Date:     2011-09-09 08:21:09 -0700 (Fri, 09 Sep 2011)
Log Message:
-----------
try harder to build correctly (32/64 bit issues)

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

Modified: trunk/dports/devel/nusmv/Portfile
===================================================================
--- trunk/dports/devel/nusmv/Portfile	2011-09-09 15:19:21 UTC (rev 83706)
+++ trunk/dports/devel/nusmv/Portfile	2011-09-09 15:21:09 UTC (rev 83707)
@@ -26,21 +26,28 @@
 depends_lib         port:readline port:expat
 
 set minisatdir      ${workpath}/NuSMV-${version}/MiniSat
+worksrcdir          NuSMV-${version}
 
 extract.only        NuSMV-${version}.tar.gz
 post-extract {
     system -W ${minisatdir} "unzip ${distpath}/minisat2-070721.zip"
 }
 
-worksrcdir          ${worksrcdir}/nusmv
-
 pre-configure {
     # build included cudd first so that configure can pick it up
-    system "cd ${workpath}/NuSMV-${version}/cudd-2.4.1.1 && make -f Makefile_os_x CPP=${configure.cxx} CC=${configure.cc}"
-    system -W ${minisatdir} "./build.sh"
+    if {$build_arch == "x86_64"} {
+        system -W ${worksrcpath}/cudd-2.4.1.1 "mv Makefile_os_x_64bit Makefile_os_x"
+    }
+    system -W ${worksrcpath}/cudd-2.4.1.1 "make -f Makefile_os_x CPP=${configure.cxx} CC=${configure.cc} ICFLAGS=\"${configure.cc_archflags}\""
+    system -W ${minisatdir} "CXX=\"${configure.cxx} ${configure.cxx_archflags}\" ./build.sh"
 }
-
+configure.dir       ${worksrcpath}/nusmv
 configure.args      --with-expat-libdir=${prefix}/lib --with-expat-incdir=${prefix}/include \
-                    --disable-zchaff --enable-minisat
+                    --disable-zchaff --enable-minisat \
+                    --with-minisat-incdir=${minisatdir}/minisat/simp \
+                    --with-minisat-libdir=${minisatdir}/minisat/simp
 
+build.dir           ${configure.dir}
+destroot.dir        ${configure.dir}
+
 use_parallel_build  no
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110909/f727b7b4/attachment.html>