Skip to content

Commit 497c71b

Browse files
Use conditional for cmake build_system
1 parent 43d573d commit 497c71b

File tree

1 file changed

+5
-8
lines changed
  • repos/spack_repo/builtin/packages/libxslt

1 file changed

+5
-8
lines changed

repos/spack_repo/builtin/packages/libxslt/package.py

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
#
33
# SPDX-License-Identifier: (Apache-2.0 OR MIT)
44

5-
from spack_repo.builtin.build_systems.autotools import AutotoolsPackage, AutotoolsBuilder
6-
from spack_repo.builtin.build_systems.cmake import CMakePackage, CMakeBuilder
5+
from spack_repo.builtin.build_systems.autotools import AutotoolsBuilder, AutotoolsPackage
6+
from spack_repo.builtin.build_systems.cmake import CMakeBuilder, CMakePackage
77

88
from spack.package import *
99

@@ -23,7 +23,7 @@ class Libxslt(CMakePackage, AutotoolsPackage):
2323

2424
license("X11", checked_by="wdconinc")
2525

26-
build_system("cmake", "autotools", default="cmake")
26+
build_system(conditional("cmake", when="@:1.1.34"), "autotools", default="cmake")
2727

2828
version("1.1.42", sha256="85ca62cac0d41fc77d3f6033da9df6fd73d20ea2fc18b0a3609ffb4110e1baeb")
2929
version("1.1.41", sha256="3ad392af91115b7740f7b50d228cc1c5fc13afc1da7f16cb0213917a37f71bda")
@@ -59,9 +59,6 @@ class Libxslt(CMakePackage, AutotoolsPackage):
5959
depends_on("python+shared", when="+python")
6060
extends("python", when="+python")
6161

62-
# CMake was added in version 1.1.35
63-
conflicts("build_system=cmake", when="@:1.1.34")
64-
6562
def url_for_version(self, v):
6663
if v > Version("1.1.34"):
6764
return f"https://download.gnome.org/sources/libxslt/{v.up_to(2)}/libxslt-{v}.tar.xz"
@@ -101,8 +98,8 @@ def configure_args(self):
10198
class CMakeBuilder(CMakeBuilder):
10299
def cmake_args(self):
103100
return [
104-
self.define_from_variant("LIBXSLT_WITH_PYTHON", "+python"),
105-
self.define_from_variant("LIBXSLT_WITH_CRYPTO", "+crypto"),
101+
self.define_from_variant("LIBXSLT_WITH_PYTHON", "python"),
102+
self.define_from_variant("LIBXSLT_WITH_CRYPTO", "crypto"),
106103
self.define("DLIBXSLT_WITH_MODULES", False),
107104
self.define("DLIBXSLT_WITH_TESTS", False),
108105
]

0 commit comments

Comments
 (0)