From 69987fd32336034366cb8425ec2b1eef4f053abd Mon Sep 17 00:00:00 2001 From: iarspider Date: Tue, 22 Nov 2022 14:10:34 +0100 Subject: cpu-features: Fix appending -DBUILD_SHARED_LIBS (#34055) Also: * Use the release tarball for v0.7.0 to fix spack warning Co-authored-by: Bernhard Kaindl <43588962+bernhardkaindl@users.noreply.github.com> --- var/spack/repos/builtin/packages/cpu-features/package.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/var/spack/repos/builtin/packages/cpu-features/package.py b/var/spack/repos/builtin/packages/cpu-features/package.py index 37b607fa40..2777e0a33a 100644 --- a/var/spack/repos/builtin/packages/cpu-features/package.py +++ b/var/spack/repos/builtin/packages/cpu-features/package.py @@ -11,11 +11,11 @@ class CpuFeatures(CMakePackage): homepage = "https://github.com/google/cpu_features" git = "https://github.com/google/cpu_features.git" + url = "https://github.com/google/cpu_features/archive/refs/tags/v0.7.0.tar.gz" version("main", branch="main") version("develop", branch="main", deprecated=True) - - version("0.7.0", tag="v0.7.0") + version("0.7.0", sha256="df80d9439abf741c7d2fdcdfd2d26528b136e6c52976be8bd0cd5e45a27262c0") variant("shared", description="Build shared libraries", default=False) @@ -23,5 +23,5 @@ class CpuFeatures(CMakePackage): def cmake_args(self): args = ["-DBUILD_TESTING:BOOL=OFF"] - args += self.enable_or_disable("BUILD_SHARED_LIBS", variant="shared") + args.append(self.define_from_variant("BUILD_SHARED_LIBS", variant="shared")) return args -- cgit v1.2.3-70-g09d2