From 9a977cb6944e1ae92fa99f84e0c46fffe65eb497 Mon Sep 17 00:00:00 2001 From: Cory Bloor Date: Thu, 31 Mar 2022 19:34:11 -0600 Subject: rocm-cmake: remove ldconfig variant (#29508) * rocm-cmake: remove ldconfig variant The packages built for `rocm-cmake~ldconfig` and `rocm-cmake+ldconfig` are identical, so the variant is unnecessary. The `ROCM_DISABLE_LDCONFIG` option changes how `rocm_create_package` generates DEB and RPM packages with CPack. rocm-cmake itself uses `rocm_create_package`, however, this option is has no effect because Spack does not build the CPack packages. It is also unnecessary on rocm-cmake, because rocm-cmake does not contain any shared libraries for ldconfig to configure. The rocm-cmake package is purely composed of CMake scripts. * Tighten CMake version dependency * Improve package description --- var/spack/repos/builtin/packages/rocm-cmake/package.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/var/spack/repos/builtin/packages/rocm-cmake/package.py b/var/spack/repos/builtin/packages/rocm-cmake/package.py index 336ef8ca4a..44d4ed3abe 100644 --- a/var/spack/repos/builtin/packages/rocm-cmake/package.py +++ b/var/spack/repos/builtin/packages/rocm-cmake/package.py @@ -8,8 +8,8 @@ from spack import * class RocmCmake(CMakePackage): - """ROCM cmake modules provides cmake modules for common build tasks - needed for the ROCM software stack""" + """rocm-cmake provides CMake modules for common build tasks + in the ROCm software stack""" homepage = "https://github.com/RadeonOpenCompute/rocm-cmake" git = "https://github.com/RadeonOpenCompute/rocm-cmake.git" @@ -35,11 +35,6 @@ class RocmCmake(CMakePackage): version('3.5.0', sha256='5fc09e168879823160f5fdf4fd1ace2702d36545bf733e8005ed4ca18c3e910f', deprecated=True) variant('build_type', default='Release', values=("Release", "Debug", "RelWithDebInfo"), description='CMake build type') - variant('ldconfig', default=True, description='ROCm ldconfig') depends_on('cmake@3:', type='build') - - def cmake_args(self): - return [ - self.define_from_variant('ROCM_DISABLE_LDCONFIG', 'ldconfig') - ] + depends_on('cmake@3.6:', type='build', when='@4.1.0:') -- cgit v1.2.3-70-g09d2