From 7bbdf13eaf0d8b6da619fa15581d1ba56c1cc072 Mon Sep 17 00:00:00 2001 From: Amy Winston Date: Thu, 26 Nov 2015 22:10:58 +0100 Subject: [PATCH] media-libs/opencv: cuda restriction for >=gcc-4.8 disabled bug #566244. Package-Manager: portage-2.2.20.1 --- media-libs/opencv/metadata.xml | 1 + media-libs/opencv/opencv-3.0.0.ebuild | 13 +++---------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/media-libs/opencv/metadata.xml b/media-libs/opencv/metadata.xml index 47c3b51a5fd2d..12a445a13b4ab 100644 --- a/media-libs/opencv/metadata.xml +++ b/media-libs/opencv/metadata.xml @@ -9,6 +9,7 @@ amynka@gentoo.org Amy Winston + Assign bugs on me. OpenCV (Open Source Computer Vision) is a library of programming functions mainly aimed at real time computer vision. diff --git a/media-libs/opencv/opencv-3.0.0.ebuild b/media-libs/opencv/opencv-3.0.0.ebuild index a101fc4a06b3c..aec55ebdfaee9 100644 --- a/media-libs/opencv/opencv-3.0.0.ebuild +++ b/media-libs/opencv/opencv-3.0.0.ebuild @@ -182,16 +182,9 @@ src_configure() { fi if use cuda; then - if [[ "$(gcc-version)" > "4.7" ]]; then - ewarn "CUDA and >=sys-devel/gcc-4.8 do not play well together. Disabling CUDA support." - mycmakeargs+=( "-DWITH_CUDA=OFF" ) - mycmakeargs+=( "-DWITH_CUBLAS=OFF" ) - mycmakeargs+=( "-DWITH_CUFFT=OFF" ) - else - mycmakeargs+=( "-DWITH_CUDA=ON" ) - mycmakeargs+=( "-DWITH_CUBLAS=ON" ) - mycmakeargs+=( "-DWITH_CUFFT=ON" ) - fi + mycmakeargs+=( "-DWITH_CUDA=ON" ) + mycmakeargs+=( "-DWITH_CUBLAS=ON" ) + mycmakeargs+=( "-DWITH_CUFFT=ON" ) else mycmakeargs+=( "-DWITH_CUDA=OFF" ) mycmakeargs+=( "-DWITH_CUBLAS=OFF" )