diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2019-02-17 13:26:59 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2019-02-17 13:39:00 +0100 |
| commit | 10670e7e6bcefd2e396297bd4ea36e884af28198 (patch) | |
| tree | e92b766dc399fecb14b95cd677c9210e144e7580 /sci-libs/flann | |
| parent | sci-libs/flann: EAPI-7 bump, fix unused cmake var (diff) | |
| download | gentoo-10670e7e6bcefd2e396297bd4ea36e884af28198.tar.gz gentoo-10670e7e6bcefd2e396297bd4ea36e884af28198.tar.bz2 gentoo-10670e7e6bcefd2e396297bd4ea36e884af28198.zip | |
sci-libs/flann: Fix build with CUDA > 9.0
Supposedly.
Closes: https://bugs.gentoo.org/678030
Package-Manager: Portage-2.3.60, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'sci-libs/flann')
| -rw-r--r-- | sci-libs/flann/files/flann-1.9.1-cuda-9.patch | 22 | ||||
| -rw-r--r-- | sci-libs/flann/flann-1.9.1-r2.ebuild | 5 |
2 files changed, 26 insertions, 1 deletions
diff --git a/sci-libs/flann/files/flann-1.9.1-cuda-9.patch b/sci-libs/flann/files/flann-1.9.1-cuda-9.patch new file mode 100644 index 000000000000..561c379af9ae --- /dev/null +++ b/sci-libs/flann/files/flann-1.9.1-cuda-9.patch @@ -0,0 +1,22 @@ +From b9dd074526c18e7423085853518b58d602cb0b57 Mon Sep 17 00:00:00 2001 +From: "Petr A. Ermolaev" <petr.a.ermolaev@gmail.com> +Date: Fri, 4 May 2018 07:50:24 +0000 +Subject: [PATCH] fix compilation via gcc and cuda 9.1 add missing #include + <thrust/gather> to kdtree_cuda_3d_index.cu + +--- + src/cpp/flann/algorithms/kdtree_cuda_3d_index.cu | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/cpp/flann/algorithms/kdtree_cuda_3d_index.cu b/src/cpp/flann/algorithms/kdtree_cuda_3d_index.cu +index e9b05080..8465322e 100644 +--- a/src/cpp/flann/algorithms/kdtree_cuda_3d_index.cu ++++ b/src/cpp/flann/algorithms/kdtree_cuda_3d_index.cu +@@ -32,6 +32,7 @@ + #include <flann/util/cuda/result_set.h> + // #define THRUST_DEBUG 1 + #include <cuda.h> ++#include <thrust/gather.h> + #include <thrust/copy.h> + #include <thrust/device_vector.h> + #include <vector_types.h> diff --git a/sci-libs/flann/flann-1.9.1-r2.ebuild b/sci-libs/flann/flann-1.9.1-r2.ebuild index 73e6a60c52bc..c240ca1dcf11 100644 --- a/sci-libs/flann/flann-1.9.1-r2.ebuild +++ b/sci-libs/flann/flann-1.9.1-r2.ebuild @@ -32,7 +32,10 @@ RDEPEND="${DEPEND}" # readd dependencies for test suite, # requires multiple ruby dependencies -PATCHES=( "${FILESDIR}"/flann-1.9.1-cmake-3.11.patch ) +PATCHES=( + "${FILESDIR}"/${P}-cmake-3.11.patch + "${FILESDIR}"/${P}-cuda-9.patch +) pkg_pretend() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp |