commit: a6639daf8bff5b5de398cfcf109a4a3385e96f0a Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Jun 3 12:38:45 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Jun 6 14:54:43 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6639daf
sci-libs/flann: Sync live with 1.9.1 updates Package-Manager: Portage-2.3.40, Repoman-2.3.9 sci-libs/flann/Manifest | 1 - sci-libs/flann/flann-9999.ebuild | 70 ++++++++++++++++------------------------ 2 files changed, 27 insertions(+), 44 deletions(-) diff --git a/sci-libs/flann/Manifest b/sci-libs/flann/Manifest index fc60a7b83e9..c8693334eee 100644 --- a/sci-libs/flann/Manifest +++ b/sci-libs/flann/Manifest @@ -1,2 +1 @@ -DIST flann-1.8.4-testdata.tar.xz 26744244 BLAKE2B eb8a5066d79dedd2ff4ec48f0e0969d6486417abfb2cc5c2e3e1e0f8dfef637f2cb290e8f1868b819ff7e4d71687daf2aaeb16c8197f5642125ea50ef775441f SHA512 f2bee5e2dfe2fbb42953df563f178b67639b62e26fc31be14e07c196ba3e84db21804e594af44991f7cf45ca5e10ff753093cf160abf33e90d19735a9a0b51cb DIST flann-1.9.1.tar.gz 485391 BLAKE2B bf1e1e7feb33e939e1d0586db593bea3fdf66726fbadec63df9ed9c7bdb678babb11001769f0d041a7a569186b3d700db8b96af5eb9740615f6dfd880460f68b SHA512 0da78bb14111013318160dd3dee1f93eb6ed077b18439fd6496017b62a8a6070cc859cfb3e08dad4c614e48d9dc1da5f7c4a21726ee45896d360506da074a6f7 diff --git a/sci-libs/flann/flann-9999.ebuild b/sci-libs/flann/flann-9999.ebuild index 2f25498da1d..06d78eb963d 100644 --- a/sci-libs/flann/flann-9999.ebuild +++ b/sci-libs/flann/flann-9999.ebuild @@ -1,55 +1,45 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 -inherit cmake-utils cuda eutils git-r3 multilib toolchain-funcs +inherit cmake-utils cuda flag-o-matic git-r3 toolchain-funcs DESCRIPTION="Fast approximate nearest neighbor searches in high dimensional spaces" HOMEPAGE="http://www.cs.ubc.ca/research/flann/"; -SRC_URI="test? ( https://dev.gentoo.org/~bicatali/distfiles/${PN}-1.8.4-testdata.tar.xz )" EGIT_REPO_URI="https://github.com/mariusmuja/flann.git"; LICENSE="BSD" SLOT="0" KEYWORDS="" -IUSE="cuda doc examples mpi openmp octave static-libs test" +IUSE="cuda doc examples mpi openmp octave static-libs" RDEPEND=" cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 ) mpi? ( sci-libs/hdf5[mpi] - dev-libs/boost[mpi] + dev-libs/boost:=[mpi] ) !mpi? ( !sci-libs/hdf5[mpi] ) octave? ( >=sci-mathematics/octave-3.6.4-r1 )" DEPEND="${RDEPEND} app-arch/unzip - doc? ( dev-tex/latex2html ) - test? ( - dev-cpp/gtest - cuda? ( sci-libs/hdf5 ) - ) -" + doc? ( dev-tex/latex2html )" +# TODO: +# readd dependencies for test suite, +# requires multiple ruby dependencies -pkg_setup() { - if use openmp; then - if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp ; then - ewarn "OpenMP is not available in your current selected gcc" - die "need openmp capable gcc" - fi - fi +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp } -src_unpack() { - default - git-r3_src_unpack +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp } src_prepare() { # bug #302621 use mpi && export CXX=mpicxx - # produce pure octave files # octave gentoo installation for .m files respected sed -i \ @@ -65,38 +55,32 @@ src_prepare() { } src_configure() { + append-cxxflags -std=c++11 + # python bindings are split + # off into dev-python/pyflann local mycmakeargs=( -DBUILD_C_BINDINGS=ON -DBUILD_PYTHON_BINDINGS=OFF -DPYTHON_EXECUTABLE= -DDOCDIR=share/doc/${PF} - $(cmake-utils_use_build cuda CUDA_LIB) - $(cmake-utils_use_build examples) - $(cmake-utils_use_build doc) - $(cmake-utils_use_build test TESTS) - $(cmake-utils_use_build octave MATLAB_BINDINGS) - $(cmake-utils_use_use mpi) - $(cmake-utils_use_use openmp) + -DBUILD_CUDA_LIB=$(usex cuda) + -DBUILD_EXAMPLES=$(usex examples) + -DBUILD_DOC=$(usex doc) + -DBUILD_TESTS=OFF + -DBUILD_MATLAB_BINDINGS=$(usex octave) + -DUSE_MPI=$(usex mpi) + -DUSE_OPENMP=$(usex openmp) + ) + use cuda && mycmakeargs+=( + -DCUDA_NVCC_FLAGS="${NVCCFLAGS} --linker-options \"-arsch\"" ) - use cuda && \ - mycmakeargs+=( - -DCUDA_NVCC_FLAGS="${NVCCFLAGS},-arsch" - ) cmake-utils_src_configure } -src_test() { - ln -s "${WORKDIR}"/testdata/* test/ || die - # -j1 to avoid obversubscribing jobs - LD_LIBRARY_PATH="${BUILD_DIR}/lib" \ - cmake-utils_src_compile -j1 test -} - src_install() { cmake-utils_src_install - dodoc README.md if ! use static-libs; then - find "${ED}" -name 'lib*.a' -exec rm -rf '{}' '+' || die + find "${D}" -name 'lib*.a' -delete || die fi }
