[64532] trunk/dports/devel/libcudd

[mww at macports.org]

Revision: 64532
          http://trac.macports.org/changeset/64532
Author:   mww at macports.org
Date:     2010-03-08 03:21:25 -0800 (Mon, 08 Mar 2010)
Log Message:
-----------
fix build on snow leopard (#22706):
-make use of configure.cc.. for compiler
-add 'class DD' to obj/cuddObj.hh
-move 'distclean' to pre-build to fix parallel build

Modified Paths:
--------------
    trunk/dports/devel/libcudd/Portfile
    trunk/dports/devel/libcudd/files/patch-obj-cuddObj.hh.diff

Modified: trunk/dports/devel/libcudd/Portfile
===================================================================
--- trunk/dports/devel/libcudd/Portfile	2010-03-08 07:20:58 UTC (rev 64531)
+++ trunk/dports/devel/libcudd/Portfile	2010-03-08 11:21:25 UTC (rev 64532)
@@ -25,17 +25,23 @@
 patchfiles          patch-Makefile.diff patch-obj-cuddObj.cc.diff patch-obj-cuddObj.hh.diff patch-cudd-Makefile.diff patch-dddmp-Makefile.diff patch-epd-Makefile.diff patch-mtr-Makefile.diff patch-obj-Makefile.diff patch-st-Makefile.diff patch-util-Makefile.diff
 
 use_configure       no
-build.target        distclean
-build.target-append build
 
+pre-build {
+    system "cd ${worksrcpath} && make distclean"
+    system "cd ${worksrcpath}/obj && make distclean"
+}
+
+build.target        build
+build.args          CC=${configure.cc} CXX=${configure.cxx} CPP=${configure.cxx}
+
 post-build {
     # generate dylib for C interface
-    exec /bin/sh -c "gcc -dynamiclib -O6 -headerpad_max_install_names -install_name ${prefix}/lib/cudd/libcudd.dylib -o ${worksrcpath}/libcudd.dylib `find ${worksrcpath}/cudd ${worksrcpath}/dddmp ${worksrcpath}/epd ${worksrcpath}/mtr ${worksrcpath}/st ${worksrcpath}/util -name '*.o'`"
+    exec /bin/sh -c "${configure.cc} -dynamiclib -O6 -headerpad_max_install_names -install_name ${prefix}/lib/cudd/libcudd.dylib -o ${worksrcpath}/libcudd.dylib `find ${worksrcpath}/cudd ${worksrcpath}/dddmp ${worksrcpath}/epd ${worksrcpath}/mtr ${worksrcpath}/st ${worksrcpath}/util -name '*.o'`"
 
     # compile the additional C++ interface
-    exec /bin/sh -c "cd ${worksrcpath}/obj && make distclean && make 1>/dev/null 2>/dev/null"
+    system "cd ${worksrcpath}/obj && make distclean && make ${build.args}"
     # generate dylib for C++ interface
-    exec /bin/sh -c "g++ -dynamiclib -O6 -headerpad_max_install_names -install_name ${prefix}/lib/cudd/libcuddobj.dylib -L${worksrcpath} -lcudd -o ${worksrcpath}/libcuddobj.dylib ${worksrcpath}/obj/cuddObj.o"
+    exec /bin/sh -c "${configure.cxx} -dynamiclib -O6 -headerpad_max_install_names -install_name ${prefix}/lib/cudd/libcuddobj.dylib -L${worksrcpath} -lcudd -o ${worksrcpath}/libcuddobj.dylib ${worksrcpath}/obj/cuddObj.o"
 }
 
 destroot {

Modified: trunk/dports/devel/libcudd/files/patch-obj-cuddObj.hh.diff
===================================================================
--- trunk/dports/devel/libcudd/files/patch-obj-cuddObj.hh.diff	2010-03-08 07:20:58 UTC (rev 64531)
+++ trunk/dports/devel/libcudd/files/patch-obj-cuddObj.hh.diff	2010-03-08 11:21:25 UTC (rev 64532)
@@ -1,7 +1,15 @@
---- oldobj/cuddObj.hh	2004-08-24 23:13:14.000000000 +0200
-+++ obj/cuddObj.hh	2008-08-16 18:37:32.000000000 +0200
-@@ -89,6 +89,232 @@
+--- obj/cuddObj.hh	2004-08-24 23:13:14.000000000 +0200
++++ obj/cuddObj.hh	2010-03-08 11:59:35.000000000 +0100
+@@ -72,6 +72,7 @@
+ /* Type definitions                                                          */
+ /*---------------------------------------------------------------------------*/
  
++class DD;
+ class ADD;
+ class BDD;
+ class ZDD;
+@@ -89,6 +90,232 @@
+ 
  /**Class***********************************************************************
  
 +  Synopsis     [Class for CUDD managers.]
@@ -233,7 +241,7 @@
    Synopsis     [Base class for all decision diagrams in CUDD.]
  
    Description  []
-@@ -103,16 +329,73 @@
+@@ -103,16 +330,73 @@
      friend class ZDD;
      Cudd *ddMgr;
      DdNode *node;
@@ -312,7 +320,7 @@
      int nodeCount() const;
      unsigned int NodeReadIndex() const;
  
-@@ -442,215 +725,6 @@
+@@ -442,215 +726,6 @@
  }; // ZDD
  
  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100308/8f86559b/attachment-0001.html>