diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-09-26 22:38:16 +0000 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-09-26 22:38:16 +0000 |
| commit | 597e0c6958d7a6da7e63b1aa788a4bf3dc66a5d5 (patch) | |
| tree | 89adbef9abeab858b419e909bbf32f569281a876 | |
| parent | Marked stable on AMD64 based on arch testing by Ian "idella4" Delaney & Elija... (diff) | |
| download | gentoo-2-597e0c6958d7a6da7e63b1aa788a4bf3dc66a5d5.tar.gz gentoo-2-597e0c6958d7a6da7e63b1aa788a4bf3dc66a5d5.tar.bz2 gentoo-2-597e0c6958d7a6da7e63b1aa788a4bf3dc66a5d5.zip | |
Disable cuda support if >=gcc-4.5, bug 383847
(Portage version: 2.1.10.19/cvs/Linux x86_64)
| -rw-r--r-- | media-libs/opencv/ChangeLog | 5 | ||||
| -rw-r--r-- | media-libs/opencv/opencv-2.3.0.ebuild | 14 |
2 files changed, 16 insertions, 3 deletions
diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog index fbd5f69f3111..523bf3d4e0bf 100644 --- a/media-libs/opencv/ChangeLog +++ b/media-libs/opencv/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-libs/opencv # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.47 2011/09/22 20:03:55 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.48 2011/09/26 22:38:16 dilfridge Exp $ + + 26 Sep 2011; Andreas K. Huettel <dilfridge@gentoo.org> opencv-2.3.0.ebuild: + Disable cuda support if >=gcc-4.5, bug 383847 22 Sep 2011; Andreas K. Huettel <dilfridge@gentoo.org> opencv-2.3.0.ebuild: Tests subdirectory has been removed from distribution diff --git a/media-libs/opencv/opencv-2.3.0.ebuild b/media-libs/opencv/opencv-2.3.0.ebuild index 389fd7a74c5f..0d41961db7ef 100644 --- a/media-libs/opencv/opencv-2.3.0.ebuild +++ b/media-libs/opencv/opencv-2.3.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.3.0.ebuild,v 1.3 2011/09/22 20:03:55 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.3.0.ebuild,v 1.4 2011/09/26 22:38:16 dilfridge Exp $ EAPI=3 @@ -99,7 +99,6 @@ src_configure() { $(cmake-utils_use_enable ssse3 SSSE3) $(cmake-utils_use_with ipp) $(cmake-utils_use_with ieee1394 1394) - $(cmake-utils_use_with cuda) $(cmake-utils_use_with eigen) $(cmake-utils_use_with ffmpeg) $(cmake-utils_use_with gstreamer) @@ -115,6 +114,17 @@ src_configure() { $(cmake-utils_use_with xine) ) + if use cuda; then + if [ "$(gcc-version)" > "4.4" ]; then + ewarn "CUDA and >=sys-devel/gcc-4.5 do not play well together. Disabling CUDA support." + mycmakeargs+=( "-DWITH_CUDA=OFF" ) + else + mycmakeargs+=( "-DWITH_CUDA=ON" ) + fi + else + mycmakeargs+=( "-DWITH_CUDA=OFF" ) + fi + if use python && use examples; then mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=ON" ) else |