From 6f8038813c460b4f0572d5ef595cdfa94af3a94d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 21 May 2019 10:20:03 +0100 Subject: gentoo resync : 21.05.2019 --- sci-libs/flann/Manifest | 5 +- .../flann/files/flann-1.9.1-cmake-3.11-1.patch | 11 +++ sci-libs/flann/flann-1.9.1-r1.ebuild | 90 ---------------------- sci-libs/flann/flann-1.9.1-r2.ebuild | 4 +- sci-libs/flann/flann-1.9.1.ebuild | 86 --------------------- 5 files changed, 15 insertions(+), 181 deletions(-) create mode 100644 sci-libs/flann/files/flann-1.9.1-cmake-3.11-1.patch delete mode 100644 sci-libs/flann/flann-1.9.1-r1.ebuild delete mode 100644 sci-libs/flann/flann-1.9.1.ebuild (limited to 'sci-libs/flann') diff --git a/sci-libs/flann/Manifest b/sci-libs/flann/Manifest index b866551b3423..23a5597c49c6 100644 --- a/sci-libs/flann/Manifest +++ b/sci-libs/flann/Manifest @@ -1,8 +1,7 @@ +AUX flann-1.9.1-cmake-3.11-1.patch 663 BLAKE2B 7162cb27a4ba6e13ac6f65752224e53be4988b3bb2ab5b8a9afbbed69a262a36c394d445fbb006afe7edbc5c9e90c339a88040eb7bee4c5c6c3209e1ba21b4ef SHA512 6d5032c30c0509951aaa5afc3f24a423d275224f67e14e0c4defbbda92ec659cef86fcfa65d72265d000f8010f0117ca2b8905f2c6f496aeef74a98dee9ffa08 AUX flann-1.9.1-cmake-3.11.patch 2998 BLAKE2B 85c6b6feb800ab1a21af86a4001b0056fda416a6b61147f614670968cca13fa2b63d06673a11a2ef72b6f0d0876539ccb68134f4817975d4b796b66a716e606d SHA512 5cdffa2da3538965c0d20fb091a13124cdc301669b622ca35a131680db8abb58cf8e02f1366604a19a5cd10dd67f14861caa1c12da3154d82d576cb8052a4b87 AUX flann-1.9.1-cuda-9.patch 850 BLAKE2B f193a6fd25a1d2cd45201d547fb444393cb82f344da6f5d1e2a012599170a412b261f6cf35d8943da7e96fd9f204991580d5ea045b43e2aa33ea5ad9fa9307d4 SHA512 0b5cad7b928319b922bdaa27d07fd38f1c359799ef9c217b6c1979f8ac9a86706e7ad1547f484aeb1db449a37693d18b2710b877483266915a869372c29ee1e4 DIST flann-1.9.1.tar.gz 485391 BLAKE2B bf1e1e7feb33e939e1d0586db593bea3fdf66726fbadec63df9ed9c7bdb678babb11001769f0d041a7a569186b3d700db8b96af5eb9740615f6dfd880460f68b SHA512 0da78bb14111013318160dd3dee1f93eb6ed077b18439fd6496017b62a8a6070cc859cfb3e08dad4c614e48d9dc1da5f7c4a21726ee45896d360506da074a6f7 -EBUILD flann-1.9.1-r1.ebuild 2242 BLAKE2B c36832b645ca46e3aa622882cca34b644d8b667def8b900f1e5eea83fa0d55677f65c14c4a17134f080b4b7fe863023a71a7aeac72385bc25a9c2a4048fb33bb SHA512 08de8ba5d423999f8403104be8efbd678e6c4981790a314e717944d6f5ca714cf97219efa445894145acc47d896ce11a49867e19c654b6c403db3b55700b5ab0 -EBUILD flann-1.9.1-r2.ebuild 2305 BLAKE2B 2a84c0364635d870ffb9b1c1dbc0f266f98323c265e8e7a7a1b833724f9a3df5eddf9a46237f6aebef4b8f186bc94b90d2ca36247fded5401d94e0692400060b SHA512 832a5bf708f07390653e0a8ff336a244861c99b8bb138d2f61f7a8cedcf5093d82a23c7684b927ff04e176c2737a2da6a22b545fec6df9904f349bc40d4cbf1b -EBUILD flann-1.9.1.ebuild 2183 BLAKE2B 8de25772b012bbbe70e13db8876688ee283d1dada1978bb9c982d1f1bc26f3daea9adaf7f12663d1a0590c03730e6da604f10bfa356a8728262681c7173af13a SHA512 7f5ff08c1fe83379577043d01b2c7cda91b4a44237cd65aa1e2cb36e10331238efdc40a9d1698b41d3ff493ac50cfa61cfc5ccae33d5cb9a03e47a94458dd05c +EBUILD flann-1.9.1-r2.ebuild 2328 BLAKE2B 7561d9f02e10301add3c59c756c52380f2ecf66ced64cdfebd77852275275f2c1fd2f9899dde69ec5f72f024b09896d5dbd5afb0b644a1fbb3e4cc2fddaabb13 SHA512 8221d601cdc3a2899af889f74122a04f37e556f19bd52f743df234a644ee16b555cdd18927a37585800ed51a2b073609f8f3397b641f82df3b12d5c08e521c14 EBUILD flann-9999.ebuild 2215 BLAKE2B bb8f804a838a8c6b1702666a92cca7ce919523b7c8590a6f816ae3ec2d8b85c44ecc237f55bd498c8e6e296388c7b1cfcb6338b7a2361a5eaef869f2987b85f4 SHA512 9d2c22c2e45bc73cd982a7d75f77ec05b0533a60dc1125cd5127aec43d74f990b81690a1e47fd67cabc2ed5da500dded79c4dd8c79dc138db6c2a36d10bac0a0 MISC metadata.xml 971 BLAKE2B 5cffd393d18c3719d8b61069dbc84f4ce4e16e6746637b1203dcba3719fb672d8db082afa93add6be9ebc4203df85391d20eb824a7a9ea3550b37295186538ff SHA512 b8416b149e26ede6d3f207d7e48316a8b880436c40c4ed5610953ceda0fee4e5b97f1b99f778678514dd115c257fb419b365ed46fdd90a19d444bca8e3e0fe03 diff --git a/sci-libs/flann/files/flann-1.9.1-cmake-3.11-1.patch b/sci-libs/flann/files/flann-1.9.1-cmake-3.11-1.patch new file mode 100644 index 000000000000..4cf8f3a990fc --- /dev/null +++ b/sci-libs/flann/files/flann-1.9.1-cmake-3.11-1.patch @@ -0,0 +1,11 @@ +--- a/src/cpp/CMakeLists.txt 2019-02-14 21:58:41.567625108 +0100 ++++ b/src/cpp/CMakeLists.txt 2019-02-14 21:59:04.017920926 +0100 +@@ -34,7 +34,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AN + target_link_libraries(flann_cpp -Wl,-whole-archive flann_cpp_s -Wl,-no-whole-archive) + + if (BUILD_CUDA_LIB) +- cuda_add_library(flann_cuda SHARED "") ++ cuda_add_library(flann_cuda SHARED "empty.cpp") + set_target_properties(flann_cuda PROPERTIES LINKER_LANGUAGE CXX) + target_link_libraries(flann_cuda -Wl,-whole-archive flann_cuda_s -Wl,-no-whole-archive) + set_property(TARGET flann_cpp_s PROPERTY COMPILE_DEFINITIONS FLANN_USE_CUDA) diff --git a/sci-libs/flann/flann-1.9.1-r1.ebuild b/sci-libs/flann/flann-1.9.1-r1.ebuild deleted file mode 100644 index fcb4ef999dff..000000000000 --- a/sci-libs/flann/flann-1.9.1-r1.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils cuda flag-o-matic toolchain-funcs - -DESCRIPTION="Fast approximate nearest neighbor searches in high dimensional spaces" -HOMEPAGE="http://www.cs.ubc.ca/research/flann/" -SRC_URI="https://github.com/mariusmuja/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux" -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] - ) - !mpi? ( !sci-libs/hdf5[mpi] ) - octave? ( >=sci-mathematics/octave-3.6.4-r1 )" -DEPEND="${RDEPEND} - app-arch/unzip - doc? ( dev-tex/latex2html )" -# TODO: -# readd dependencies for test suite, -# requires multiple ruby dependencies - -PATCHES=( - "${FILESDIR}"/flann-1.9.1-cmake-3.11.patch -) - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -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 \ - -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() { - 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} - -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\"" - ) - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - if ! use static-libs; then - find "${D}" -name 'lib*.a' -delete || die - fi -} diff --git a/sci-libs/flann/flann-1.9.1-r2.ebuild b/sci-libs/flann/flann-1.9.1-r2.ebuild index b628b93c4ced..f6ffdd259b22 100644 --- a/sci-libs/flann/flann-1.9.1-r2.ebuild +++ b/sci-libs/flann/flann-1.9.1-r2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/mariusmuja/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm arm64 ~ppc x86 ~amd64-linux ~x86-linux" IUSE="cuda doc examples mpi openmp octave static-libs" BDEPEND=" @@ -33,7 +33,7 @@ RDEPEND="${DEPEND}" # requires multiple ruby dependencies PATCHES=( - "${FILESDIR}"/${P}-cmake-3.11.patch + "${FILESDIR}"/${P}-cmake-3.11{,-1}.patch # bug 678030 "${FILESDIR}"/${P}-cuda-9.patch ) diff --git a/sci-libs/flann/flann-1.9.1.ebuild b/sci-libs/flann/flann-1.9.1.ebuild deleted file mode 100644 index 98e3f17c9fdc..000000000000 --- a/sci-libs/flann/flann-1.9.1.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils cuda flag-o-matic toolchain-funcs - -DESCRIPTION="Fast approximate nearest neighbor searches in high dimensional spaces" -HOMEPAGE="http://www.cs.ubc.ca/research/flann/" -SRC_URI="https://github.com/mariusmuja/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux" -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] - ) - !mpi? ( !sci-libs/hdf5[mpi] ) - octave? ( >=sci-mathematics/octave-3.6.4-r1 )" -DEPEND="${RDEPEND} - app-arch/unzip - doc? ( dev-tex/latex2html )" -# TODO: -# readd dependencies for test suite, -# requires multiple ruby dependencies - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -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 \ - -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() { - 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} - -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\"" - ) - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - if ! use static-libs; then - find "${D}" -name 'lib*.a' -delete || die - fi -} -- cgit v1.2.3