summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorMassimiliano Culpo <massimiliano.culpo@gmail.com>2020-11-01 01:05:13 +0100
committerGitHub <noreply@github.com>2020-10-31 19:05:13 -0500
commit77fc458d2964490c83863d667df10b9a740ce05e (patch)
tree913469600aed3bd1cd58b83892c8a46885ca45b5 /var
parent6b35324cf35cf655c2342c8ecd8a17fdb4ce86c4 (diff)
downloadspack-77fc458d2964490c83863d667df10b9a740ce05e.tar.gz
spack-77fc458d2964490c83863d667df10b9a740ce05e.tar.bz2
spack-77fc458d2964490c83863d667df10b9a740ce05e.tar.xz
spack-77fc458d2964490c83863d667df10b9a740ce05e.zip
opencv: fixed conflict firectives (missing '^') (#19645)
See https://github.com/spack/spack/pull/19501#issuecomment-718406357
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/opencv/package.py8
1 files changed, 2 insertions, 6 deletions
diff --git a/var/spack/repos/builtin/packages/opencv/package.py b/var/spack/repos/builtin/packages/opencv/package.py
index 52f59263b8..7282ffe5bd 100644
--- a/var/spack/repos/builtin/packages/opencv/package.py
+++ b/var/spack/repos/builtin/packages/opencv/package.py
@@ -2,10 +2,6 @@
# Spack Project Developers. See the top-level COPYRIGHT file for details.
#
# SPDX-License-Identifier: (Apache-2.0 OR MIT)
-
-from spack import *
-
-
class Opencv(CMakePackage, CudaPackage):
"""OpenCV is released under a BSD license and hence it's free for both
academic and commercial use. It has C++, C, Python and Java interfaces and
@@ -151,8 +147,8 @@ class Opencv(CMakePackage, CudaPackage):
# TODO For Cuda >= 10, make sure 'dynlink_nvcuvid.h' or 'nvcuvid.h'
# exists, otherwise build will fail
# See https://github.com/opencv/opencv_contrib/issues/1786
- conflicts('cuda@10:', when='+cudacodec')
- conflicts('cuda', when='~contrib', msg='cuda support requires +contrib')
+ conflicts('^cuda@10:', when='+cudacodec')
+ conflicts('^cuda', when='~contrib', msg='cuda support requires +contrib')
# IPP is provided x86_64 only
conflicts('+ipp', when="arch=aarch64:")