summaryrefslogtreecommitdiff
path: root/sci-libs/flann
diff options
context:
space:
mode:
Diffstat (limited to 'sci-libs/flann')
-rw-r--r--sci-libs/flann/Manifest5
-rw-r--r--sci-libs/flann/flann-1.8.4-r1.ebuild108
-rw-r--r--sci-libs/flann/flann-9999.ebuild70
3 files changed, 28 insertions, 155 deletions
diff --git a/sci-libs/flann/Manifest b/sci-libs/flann/Manifest
index 776bfcc49c80..ea3a2c7cf1d7 100644
--- a/sci-libs/flann/Manifest
+++ b/sci-libs/flann/Manifest
@@ -4,10 +4,7 @@ AUX flann-1.8.4-docdir.patch 571 BLAKE2B 19e6c5161290bec1b85157452884ba9c6272fe8
AUX flann-1.8.4-examples.patch 1020 BLAKE2B b4eb466cb53aa6e4ebb2285c605685974e6d371fd4efd2a33c71c78acf427c33c326ca5c29b38a6a8e3641c1063226f18c9dcf75a6e4e5e095a9ca3555bf83af SHA512 5baeb594d2b4a1a8456135c9f0bec72a3182dcacbdebd398b079f13982e5e7a1722500313699ea25b7085f1dca3cab4ea355992d9014135e011452168e65fc83
AUX flann-1.8.4-multilib.patch 570 BLAKE2B c3f6e2a88a6d6eed16b5cafedf2ba99b51d9686e83f2f8b10ac7ed28b835965cda7ff4702d2f106585cea941ae1475eab89f1323f3c5ad8e05553203c5bece8d SHA512 1f5a72920af200f23a318b3205cce498a6f193eb8f89b85fcc9b8ef45c49b4b98143cc9cc6996821e63cdb709eeac0f13b46c129471aa82a06ec22be1f4ec8f6
AUX flann-1.8.4-options.patch 1485 BLAKE2B 2691716dfda2e931849a0852c7be75b3dbc14877950ade2a52481108d75b84aea2686f2245f7b924c0f1a20f94e3ff34372fda519c474e0bdfc961911e746ccf SHA512 2335ddf683d883f0b5247b4d7e688644231c2d6a914c0d271965b0024270e77a36ccded142ab666651833712cb64a427eb753f76757cf5eb765f130b170f4251
-DIST flann-1.8.4-src.zip 561057 BLAKE2B 0cd1cf7bc394501d878d848246f76919924e39dc950e49e82bd2c8dbf46d9626fc9749ba4578ce62aabd0313314969dd7f6883c42167545238bc89561ce028ce SHA512 47ac6be66e3ec7303d28febc5a4cea2f8d1b3d81c3b7081f27cf17936074e06e91e30123569b41269a2b97c9960274dc485a575d77c1a386e8f539a76a8d3a0a
-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
-EBUILD flann-1.8.4-r1.ebuild 2691 BLAKE2B 7cb6cc288d4b6fbcd6af98cc612b5ed21ec41cf421ce4fc9385fac0c1e124802b8818303540d88070f60e50f0805c40f7a5428e852d9ada601ebfa49d6687e28 SHA512 1fbac04c82251e1dd9ee912128b74822a7fd7dd890f9a3272a1c6a3e37c8156623a9fd4b73c369497b0462615e8117dc6e94359f791b12d428788e596e1a6bbd
EBUILD flann-1.9.1.ebuild 2185 BLAKE2B d81b5cc93e470f846c915401b35d7bcdae4c8c9a14c412829035367f85c1f4c9eb690bef0002d24adf78ab655603a06c14969a95670fab826baf04f14b025d2a SHA512 d2b3ee61c1066ca047bfa5ccbad4c37402fc3f10fbe0f4be8ea75580935de055cde09ea7db2a9a51ba4da14e7f069748be8642c63b5cd074d86bffbaaf568650
-EBUILD flann-9999.ebuild 2449 BLAKE2B e7cad0db176ec4b58b7e776608a4bbb8df3686042bdcf7c13123573ed9ba3be2a773f2cfe969d89a2bfb2661612cdcff872c286dc809d3c099441622d93edd29 SHA512 c5bd3475386f5cb7f5a0c7d71932694752a48f2f67a8052cf668424ff2fce69f0d2fbfa040b994e06942c17502bac1b3f0032f7387325d0d9c3578273c353f6b
+EBUILD flann-9999.ebuild 2121 BLAKE2B 336e31bc0e5ece6c63ca3c82e3b61605fbfa46e76ab111574b3d05303add959c31b2339c60768d7ab32f56e534b7cb08f08c1a29fb15279bf2d048a02d00df06 SHA512 6e3978c5c92f2723eed4615cc292aedd3be146a9afe0fc47cd1922a12fb9fb58d81d2f284f2946d96c5f4c2d235f06c0dc5929b37258ea83bf412d36a0ac1e2e
MISC metadata.xml 971 BLAKE2B 5cffd393d18c3719d8b61069dbc84f4ce4e16e6746637b1203dcba3719fb672d8db082afa93add6be9ebc4203df85391d20eb824a7a9ea3550b37295186538ff SHA512 b8416b149e26ede6d3f207d7e48316a8b880436c40c4ed5610953ceda0fee4e5b97f1b99f778678514dd115c257fb419b365ed46fdd90a19d444bca8e3e0fe03
diff --git a/sci-libs/flann/flann-1.8.4-r1.ebuild b/sci-libs/flann/flann-1.8.4-r1.ebuild
deleted file mode 100644
index 00be826a33e5..000000000000
--- a/sci-libs/flann/flann-1.8.4-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils cuda eutils multilib toolchain-funcs
-
-DESCRIPTION="Fast approximate nearest neighbor searches in high dimensional spaces"
-HOMEPAGE="http://www.cs.ubc.ca/research/flann/"
-SRC_URI="
- http://people.cs.ubc.ca/~mariusm/uploads/FLANN/${P}-src.zip
- test? ( https://dev.gentoo.org/~bicatali/distfiles/${P}-testdata.tar.xz )"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="cuda doc examples mpi openmp octave static-libs test"
-
-RDEPEND="
- cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 )
- mpi? (
- sci-libs/hdf5[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 )
- )
-"
-
-PATCHES=(
- "${FILESDIR}"/${P}-examples.patch
- "${FILESDIR}"/${P}-options.patch
- "${FILESDIR}"/${P}-CUDA_NVCC_FLAGS.patch
- "${FILESDIR}"/${P}-cuda5.5.patch
- "${FILESDIR}"/${P}-multilib.patch
- "${FILESDIR}"/${P}-docdir.patch
-)
-
-S="${WORKDIR}"/${P}-src
-
-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
-}
-
-src_prepare() {
- # bug #302621
- use mpi && export CXX=mpicxx
- # produce pure octave files
- # octave gentoo installation for .m files respected
- sed -i \
- -e 's/--mex//' \
- -e 's/\.mex/\.oct/' \
- -e '/FILES/s/${MEX_FILE}//' \
- -e 's:share/flann/octave:share/octave/site/m:' \
- -e "/CUSTOM_TARGET/a\INSTALL(FILES \${MEX_FILE} DESTINATION libexec/octave/site/oct/${CHOST})" \
- src/matlab/CMakeLists.txt || die
- use cuda && cuda_src_prepare
-
- cmake-utils_src_prepare
-}
-
-src_configure() {
- # python bindings are split
- 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)
- )
- 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
- fi
-}
diff --git a/sci-libs/flann/flann-9999.ebuild b/sci-libs/flann/flann-9999.ebuild
index 2f25498da1dc..06d78eb963d7 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
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-15 04:43:52 +0000