[89471] trunk/dports/science/ompl

31 Jan 2012

Revision: 89471
          http://trac.macports.org/changeset/89471
Author:   mmoll@macports.org
Date:     2012-01-30 18:23:21 -0800 (Mon, 30 Jan 2012)
Log Message:
-----------
science/ompl: clang doesn't work with +app variant. Need patch for some compilers.

Modified Paths:
--------------
    trunk/dports/science/ompl/Portfile

Added Paths:
-----------
    trunk/dports/science/ompl/files/
    trunk/dports/science/ompl/files/patch-src-ompl-extensions-ode-src-ODEEnvironment.cpp.diff

Modified: trunk/dports/science/ompl/Portfile
===================================================================

--- trunk/dports/science/ompl/Portfile	2012-01-30 23:39:06 UTC (rev 89470)
+++ trunk/dports/science/ompl/Portfile	2012-01-31 02:23:21 UTC (rev 89471)
@@ -5,6 +5,7 @@
 
 name                ompl
 version             0.9.5
+revision            1
 categories          science
 maintainers         mmoll
 description         The Open Motion Planning Library (OMPL)
@@ -18,6 +19,8 @@
                     sha1    9b5e8e27ba357b1a212ce8486e1551aab921bf53 \
                     rmd160  7c657501c3df98111c0a2030ada2b0fc6263abc0
 distname            ${name}-${version}-Source
+patchfiles          patch-src-ompl-extensions-ode-src-ODEEnvironment.cpp.diff
+patch.pre_args      -p1
 depends_lib-append  port:boost port:ode
 test.run            yes
 
@@ -31,6 +34,10 @@
 # regular OMPL version.
 variant app description {Include GUI and extra demo code} {
     distname            omplapp-${version}-Source
+    patch.pre_args      -p0
+    if {${configure.compiler} == "clang"} {
+        configure.compiler "llvm-gcc-4.2"
+    }
     license             multiple
     pre-extract {
         ui_warn "The +app variant causes some extra code to be compiled that is
@@ -45,7 +52,8 @@
 }
 
 variant python26 description {Use python2.6 for python bindings} conflicts python27 {
-    depends_lib-append      port:python26 port:py26-pyplusplus-devel
+    depends_build-append    port:py26-pyplusplus-devel
+    depends_lib-append      port:python26
     build.target            update_bindings all
     if { [variant_isset app] } {
         depends_lib-append      port:py26-pyqt4 port:py26-opengl
@@ -58,7 +66,8 @@
 }
 
 variant python27 description {Use python2.7 for python bindings} conflicts python26 {
-    depends_lib-append      port:python27 port:py27-pyplusplus-devel
+    depends_build-append    port:py27-pyplusplus-devel
+    depends_lib-append      port:python27
     build.target            update_bindings all
     if { [variant_isset app] } {
         depends_lib-append  port:py27-pyqt4 port:py27-opengl

Added: trunk/dports/science/ompl/files/patch-src-ompl-extensions-ode-src-ODEEnvironment.cpp.diff
===================================================================
--- trunk/dports/science/ompl/files/patch-src-ompl-extensions-ode-src-ODEEnvironment.cpp.diff	                        (rev 0)
+++ trunk/dports/science/ompl/files/patch-src-ompl-extensions-ode-src-ODEEnvironment.cpp.diff	2012-01-31 02:23:21 UTC (rev 89471)
@@ -0,0 +1,11 @@
+--- ompl/src/ompl/extensions/ode/src/ODEEnvironment.cpp.orig	2012-01-30 19:18:52.000000000 -0600
++++ ompl/src/ompl/extensions/ode/src/ODEEnvironment.cpp	2012-01-30 19:18:00.000000000 -0600
+@@ -61,7 +61,7 @@
+ {
+     std::map<dGeomID, std::string>::const_iterator it = geomNames_.find(geom);
+     if (it == geomNames_.end())
+-        return boost::lexical_cast<std::string>(geom);
++        return boost::lexical_cast<std::string>(reinterpret_cast<unsigned long>(geom));
+     else
+         return it->second;
+ }

    

[89471] trunk/dports/science/ompl

mmoll＠macports.org