Revision: 140077 https://trac.macports.org/changeset/140077 Author: eborisch@macports.org Date: 2015-09-08 13:05:23 -0700 (Tue, 08 Sep 2015) Log Message: ----------- eigen3: Use cmake.out_of_source = yes (instead of doing our own out-of-source build.) Update eigen3-devel to 3.3-alpha1. Modified Paths: -------------- trunk/dports/math/eigen3/Portfile Modified: trunk/dports/math/eigen3/Portfile =================================================================== --- trunk/dports/math/eigen3/Portfile 2015-09-08 18:35:47 UTC (rev 140076) +++ trunk/dports/math/eigen3/Portfile 2015-09-08 20:05:23 UTC (rev 140077) @@ -39,17 +39,15 @@ patchfiles unsupported.patch } else { # No current development version (other than rolling snapshot) - bitbucket.setup eigen eigen 90c881e + bitbucket.setup eigen eigen 3.3-alpha1 name eigen3-devel conflicts eigen3 - version 3.2.90.20150619 - revision 0 # rc version seen as older than beta epoch 1 checksums \ - rmd160 e1f4144d5841f7c9ee146439b6804125fd4a0e5f \ - sha256 0c40b0c8829ba6b72f19336583abfcdb6a0bc20a2fd09430b6c5efc138bad6df + rmd160 5dbf3e6619c788b4b278aaa3b27af996fe9370b0 \ + sha256 db432d0c5b8a51292d527c8d235e5af5787cb4855186e439b9570c5428471f20 } homepage http://eigen.tuxfamily.org/ @@ -70,11 +68,8 @@ configure.universal_args "" } -# Out of source build -configure.post_args ../eigen_src configure.env-append PKG_CONFIG_LIBDIR=${prefix}/lib/pkgconfig -# We're doing our own -cmake.out_of_source no +cmake.out_of_source yes test.run yes test.target check @@ -110,11 +105,8 @@ extract.post_args-append -C ${worksrcpath} --strip-components 1 post-patch { - # Move directory for out-of-source build - move ${worksrcpath} ${workpath}/eigen_src copy ${filespath}/CMakeLists-eigenvalues.txt \ - ${workpath}/eigen_src/unsupported/Eigen/src/Eigenvalues/CMakeLists.txt - file mkdir ${worksrcpath} + ${worksrcpath}/unsupported/Eigen/src/Eigenvalues/CMakeLists.txt } # Install licenses and (if +doc) documentation @@ -132,7 +124,7 @@ foreach sfx ${build_suffix} { set docdir ${destroot}${sfx}${prefix}/share/doc/eigen3 xinstall -d ${docdir} - xinstall -m 644 -W ${workpath}/eigen_src \ + xinstall -m 644 -W ${worksrcpath} \ COPYING.GPL COPYING.LGPL ${docdir} # Install documentation if requested @@ -141,7 +133,7 @@ # The documentation created is slightly different for each arch # which makes muniversal hiccup. Just copy one set of docs # into destroot directories. - file copy ${worksrcpath}${sfx}/doc/html ${docdir} + file copy ${cmake.build_dir}${sfx}/doc/html ${docdir} # Temporary fix for doxygen changes file copy ${filespath}/ftv2node.png ${docdir}/html file copy ${filespath}/ftv2pnode.png ${docdir}/html @@ -154,21 +146,21 @@ set libdir ${destroot}${sfx}${prefix}/lib xinstall -d ${libdir} eval file copy \ - [glob ${worksrcpath}${sfx}/blas/libeigen_blas*] ${libdir} + [glob ${cmake.build_dir}${sfx}/blas/libeigen_blas*] ${libdir} } } } post-destroot { # Grab extra items install doesn't out of unsupported - foreach n {README.txt bench doc test} { - file copy ${workpath}/eigen_src/unsupported/${n} \ + foreach n {README.txt bench} { + file copy ${worksrcpath}/unsupported/${n} \ ${destroot}${prefix}/include/eigen3/unsupported } # Install FindEigen3.cmake file xinstall -d ${destroot}${cmake_share_module_dir} - xinstall -m 444 ${workpath}/eigen_src/cmake/FindEigen3.cmake \ + xinstall -m 444 ${worksrcpath}/cmake/FindEigen3.cmake \ ${destroot}${cmake_share_module_dir} }