From: Andreas Sturmlechner Date: Sun, 19 May 2019 21:18:08 +0000 (+0200) Subject: sci-libs/flann: Add another fix for >=cmake-3.11 with cuda X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=9a4be0df9bfd7588f37b0721568571e614608a8f;p=gentoo.git sci-libs/flann: Add another fix for >=cmake-3.11 with cuda Thanks-to: LE GARREC Vincent Closes: https://bugs.gentoo.org/678030 Package-Manager: Portage-2.3.66, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner --- 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-r2.ebuild b/sci-libs/flann/flann-1.9.1-r2.ebuild index b628b93c4ced..4b72bf9fbe2b 100644 --- a/sci-libs/flann/flann-1.9.1-r2.ebuild +++ b/sci-libs/flann/flann-1.9.1-r2.ebuild @@ -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 )