Revision: 90276 http://trac.macports.org/changeset/90276 Author: mmoll@macports.org Date: 2012-02-28 17:10:32 -0800 (Tue, 28 Feb 2012) Log Message: ----------- science/ompl: delete redundant files. mark as non-universal, since one of the dependents is not universal. move code generation from pre-build to post-configure, so that the code will not get regenerated repeatedly if "port build" fails, manual fixes are made, and "port build" is tried again. Modified Paths: -------------- trunk/dports/science/ompl/Portfile Modified: trunk/dports/science/ompl/Portfile =================================================================== --- trunk/dports/science/ompl/Portfile 2012-02-29 01:02:35 UTC (rev 90275) +++ trunk/dports/science/ompl/Portfile 2012-02-29 01:10:32 UTC (rev 90276) @@ -5,6 +5,7 @@ name ompl version 0.10.1 +revision 1 categories science maintainers mmoll description The Open Motion Planning Library (OMPL) @@ -20,8 +21,13 @@ distname ${name}-${version}-Source depends_lib-append port:boost port:ode +# no universal of gccxml-devel +universal_variant no configure.args-append -DOMPL_BUILD_TESTS=OFF -DOMPL_BUILD_DEMOS=OFF -pre-build { +# generate the extra C++ code needed for Python bindings. This code seems +# somewhat dependent on compiler and/or boost version, so we can't +# pre-generate them and make them available as an extra download. +post-configure { system "cd ${worksrcpath}; ${build.cmd} update_bindings" } @@ -55,7 +61,17 @@ post-destroot { reinplace "s|#!/usr/bin/env python|#!${prefix}/bin/python2.6|g" \ ${destroot}${prefix}/bin/ompl_app + # not needed and causes problems with rpaths + delete \ + ${destroot}${prefix}/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/ompl/util/libompl.dylib \ + ${destroot}${prefix}/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/ompl/app/libompl_app.dylib } + } else { + post-destroot { + # not needed and causes problems with rpaths + delete \ + ${destroot}${prefix}/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/ompl/util/libompl.dylib + } } } @@ -68,7 +84,17 @@ post-destroot { reinplace "s|#!/usr/bin/env python|#!${prefix}/bin/python2.7|g" \ ${destroot}${prefix}/bin/ompl_app + # not needed and causes problems with rpaths + delete \ + ${destroot}${prefix}/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/site-packages/ompl/util/libompl.dylib \ + ${destroot}${prefix}/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/site-packages/ompl/app/libompl_app.dylib } + } else { + post-destroot { + # not needed and causes problems with rpaths + delete \ + ${destroot}${prefix}/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/site-packages/ompl/util/libompl.dylib + } } }