From 384300100498751b66fa001f1139dbf0db0db0fa Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Wed, 9 Aug 2023 14:20:49 +0200 Subject: Fixed bugs discovered in conflicts directives (#39338) --- var/spack/repos/builtin/packages/amqp-cpp/package.py | 2 +- var/spack/repos/builtin/packages/dealii/package.py | 4 +--- var/spack/repos/builtin/packages/gptune/package.py | 2 +- var/spack/repos/builtin/packages/lua-luajit-openresty/package.py | 1 - var/spack/repos/builtin/packages/lua-luajit/package.py | 1 - var/spack/repos/builtin/packages/paraview/package.py | 6 +++--- var/spack/repos/builtin/packages/plasma/package.py | 3 --- var/spack/repos/builtin/packages/py-pykwalify/package.py | 2 +- var/spack/repos/builtin/packages/xyce/package.py | 1 + 9 files changed, 8 insertions(+), 14 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/amqp-cpp/package.py b/var/spack/repos/builtin/packages/amqp-cpp/package.py index 363ad0b546..5225472776 100644 --- a/var/spack/repos/builtin/packages/amqp-cpp/package.py +++ b/var/spack/repos/builtin/packages/amqp-cpp/package.py @@ -27,7 +27,7 @@ class AmqpCpp(CMakePackage): ) variant("shared", default=True, description="Build as a shared library (static by default)") - conflicts("tcp", when="platform=darwin", msg="TCP module requires Linux") + conflicts("+tcp", when="platform=darwin", msg="TCP module requires Linux") depends_on("cmake@3.5:", type="build") depends_on("openssl@1.1.1:", when="+tcp", type=("build", "link", "run")) diff --git a/var/spack/repos/builtin/packages/dealii/package.py b/var/spack/repos/builtin/packages/dealii/package.py index 93723cd29f..469ce177f7 100644 --- a/var/spack/repos/builtin/packages/dealii/package.py +++ b/var/spack/repos/builtin/packages/dealii/package.py @@ -361,9 +361,7 @@ class Dealii(CMakePackage, CudaPackage): ) # Optional dependencies: - conflicts( - "+adol-c", when="^netcdf", msg="Symbol clash between the ADOL-C library and " "Netcdf." - ) + conflicts("+adol-c", when="+netcdf", msg="Symbol clash between the ADOL-C library and Netcdf.") conflicts( "+adol-c", when="^trilinos+chaco", diff --git a/var/spack/repos/builtin/packages/gptune/package.py b/var/spack/repos/builtin/packages/gptune/package.py index 34edd7c919..02cb93a363 100644 --- a/var/spack/repos/builtin/packages/gptune/package.py +++ b/var/spack/repos/builtin/packages/gptune/package.py @@ -64,7 +64,7 @@ class Gptune(CMakePackage): conflicts("mpich", when="+mpispawn") conflicts("spectrum-mpi", when="+mpispawn") conflicts("cray-mpich", when="+mpispawn") - conflicts("gcc@:7") + conflicts("%gcc@:7") def cmake_args(self): spec = self.spec diff --git a/var/spack/repos/builtin/packages/lua-luajit-openresty/package.py b/var/spack/repos/builtin/packages/lua-luajit-openresty/package.py index 08c4356cf9..fbcc63cded 100644 --- a/var/spack/repos/builtin/packages/lua-luajit-openresty/package.py +++ b/var/spack/repos/builtin/packages/lua-luajit-openresty/package.py @@ -29,7 +29,6 @@ class LuaLuajitOpenresty(LuaImplPackage): ) provides("lua-lang@5.1", when="+lualinks") - conflicts("lua", when="+lualinks") provides("luajit") lua_version_override = "5.1" diff --git a/var/spack/repos/builtin/packages/lua-luajit/package.py b/var/spack/repos/builtin/packages/lua-luajit/package.py index 8ac4fa0091..e8a1c124e0 100644 --- a/var/spack/repos/builtin/packages/lua-luajit/package.py +++ b/var/spack/repos/builtin/packages/lua-luajit/package.py @@ -34,7 +34,6 @@ class LuaLuajit(LuaImplPackage): ) provides("lua-lang@5.1", when="+lualinks") - conflicts("lua", when="+lualinks") provides("luajit") lua_version_override = "5.1" conflicts("platform=darwin", msg="luajit not supported on MacOS, see lua-luajit-openresty") diff --git a/var/spack/repos/builtin/packages/paraview/package.py b/var/spack/repos/builtin/packages/paraview/package.py index b5c5cf7ca4..d98d1b6a27 100644 --- a/var/spack/repos/builtin/packages/paraview/package.py +++ b/var/spack/repos/builtin/packages/paraview/package.py @@ -139,9 +139,6 @@ class Paraview(CMakePackage, CudaPackage, ROCmPackage): msg="Use paraview@5.9.0 with %xl_r. Earlier versions are not able to build with xl.", ) - # Newer abseil-cpp requires C++14, but paraview uses C++11 by default - conflicts("^abseil-cpp@2023:") - # We only support one single Architecture for _arch, _other_arch in itertools.permutations(CudaPackage.cuda_arch_values, 2): conflicts( @@ -226,6 +223,9 @@ class Paraview(CMakePackage, CudaPackage, ROCmPackage): depends_on("protobuf@3.4:3.18", when="@:5.10%intel@2021:") depends_on("protobuf@3.4:3.18", when="@:5.10%xl") depends_on("protobuf@3.4:3.18", when="@:5.10%xl_r") + # protobuf requires newer abseil-cpp, which in turn requires C++14, + # but paraview uses C++11 by default + depends_on("protobuf@3.4:3.21", when="@:5.11") depends_on("libxml2") depends_on("lz4") depends_on("xz") diff --git a/var/spack/repos/builtin/packages/plasma/package.py b/var/spack/repos/builtin/packages/plasma/package.py index 98be783b39..6b92413fd7 100644 --- a/var/spack/repos/builtin/packages/plasma/package.py +++ b/var/spack/repos/builtin/packages/plasma/package.py @@ -62,9 +62,6 @@ class Plasma(CMakePackage): conflicts("^netlib-lapack@:3.5") # clashes with OpenBLAS declarations and has a problem compiling on its own - conflicts("^cblas") - - conflicts("^openblas-with-lapack") # incomplete LAPACK implementation conflicts("^veclibfort") # only GCC 4.9+ and higher have sufficient support for OpenMP 4+ tasks+deps diff --git a/var/spack/repos/builtin/packages/py-pykwalify/package.py b/var/spack/repos/builtin/packages/py-pykwalify/package.py index bbf8ec4713..73747d0dfe 100644 --- a/var/spack/repos/builtin/packages/py-pykwalify/package.py +++ b/var/spack/repos/builtin/packages/py-pykwalify/package.py @@ -23,4 +23,4 @@ class PyPykwalify(PythonPackage): depends_on("py-python-dateutil@2.4.2:", type=("build", "run")) depends_on("py-pyyaml@3.11:", type=("build", "run"), when="@1.6.1") - conflicts("^py-ruamel@0.16.0:", when="@1.6.1") + conflicts("^py-ruamel-yaml@0.16.0:", when="@1.6.1") diff --git a/var/spack/repos/builtin/packages/xyce/package.py b/var/spack/repos/builtin/packages/xyce/package.py index 25a5696fe3..6c1b95c335 100644 --- a/var/spack/repos/builtin/packages/xyce/package.py +++ b/var/spack/repos/builtin/packages/xyce/package.py @@ -99,6 +99,7 @@ class Xyce(CMakePackage): # Issue #1712 forces explicitly enumerating blas packages to propagate variants with when("+pymi_static_tpls"): # BLAS + depends_on("blas") depends_on("openblas~shared", when="^openblas") depends_on("netlib-lapack~shared", when="^netlib-lapack~external-blas") -- cgit v1.2.3-70-g09d2