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>
This commit is contained in:
Andreas Sturmlechner
2019-02-17 13:26:59 +01:00
parent 6026d536aa
commit 10670e7e6b
2 changed files with 26 additions and 1 deletions

View File

@@ -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>

View File

@@ -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