From 91aad04a98e2a45c516b2df06726716c7caa491e Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Mon, 2 Dec 2024 13:56:59 -0700 Subject: [PATCH] Reinstantiate rust-bootstrap variant for py-cryptography --- .../repos/builtin/packages/py-cryptography/package.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/var/spack/repos/builtin/packages/py-cryptography/package.py b/var/spack/repos/builtin/packages/py-cryptography/package.py index 214deae9b1d7ed..7590b6493ab9ba 100644 --- a/var/spack/repos/builtin/packages/py-cryptography/package.py +++ b/var/spack/repos/builtin/packages/py-cryptography/package.py @@ -34,6 +34,7 @@ class PyCryptography(PythonPackage): version("1.8.1", sha256="323524312bb467565ebca7e50c8ae5e9674e544951d28a2904a50012a8828190") variant("idna", default=False, when="@2.5:3.0", description="Deprecated U-label support") + variant("rust_bootstrap", default=False, when="@3.4.3:", description="Use pre-compiled Rust") # distutils required in version <= 40 depends_on("python@:3.11", when="@:40", type=("build", "run")) @@ -52,10 +53,12 @@ class PyCryptography(PythonPackage): depends_on("py-setuptools-rust@1.7.0:", when="@42", type=("build", "run")) depends_on("py-setuptools-rust@0.11.4:", when="@3.4.2:", type="build") depends_on("py-setuptools-rust@0.11.4:", when="@3.4:3.4.1", type=("build", "run")) - depends_on("rust@1.56:", when="@41:", type="build") - depends_on("rust@1.48:", when="@38:", type="build") - depends_on("rust@1.41:", when="@3.4.5:", type="build") - depends_on("rust@1.45:", when="@3.4.3:3.4.4", type="build") + with when("~rust_bootstrap"): + depends_on("rust@1.56:", when="@41:", type="build") + depends_on("rust@1.48:", when="@38:", type="build") + depends_on("rust@1.41:", when="@3.4.5:", type="build") + depends_on("rust@1.45:", when="@3.4.3:3.4.4", type="build") + depends_on("rust-bootstrap", when="+rust_bootstrap", type="build") depends_on("pkgconfig", when="@40:", type="build") depends_on("py-cffi@1.12:", when="@3.3:", type=("build", "run"))