From c43205d6de35a5bdfece45ca4873f5818e7b9f7c Mon Sep 17 00:00:00 2001 From: Jordan Galby <67924449+Jordan474@users.noreply.github.com> Date: Mon, 22 Jul 2024 21:16:08 +0200 Subject: asciidoc: Fix asciidoc@10 install (#44926) --- var/spack/repos/builtin/packages/asciidoc/package.py | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/asciidoc/package.py b/var/spack/repos/builtin/packages/asciidoc/package.py index 5e31e98cd9..80f8e6bd97 100644 --- a/var/spack/repos/builtin/packages/asciidoc/package.py +++ b/var/spack/repos/builtin/packages/asciidoc/package.py @@ -6,7 +6,7 @@ from spack.package import * -class Asciidoc(AutotoolsPackage): +class Asciidoc(AutotoolsPackage, PythonPackage): """A presentable text document format for writing articles, UNIX man pages and other small to medium sized documents.""" @@ -17,6 +17,12 @@ class Asciidoc(AutotoolsPackage): license("GPL-2.0-only", checked_by="tgamblin") + build_system( + conditional("autotools", when="@:9"), + conditional("python_pip", when="@10:"), + default="python_pip", + ) + version("master", branch="master") version("10.2.0", sha256="684ea53c1f5b71d6d1ac6086bbc96906b1f709ecc7ab536615b0f0c9e1baa3cc") version("9.1.0", sha256="5056c20157349f8dc74f005b6e88ccbf1078c4e26068876f13ca3d1d7d045fe7") @@ -31,6 +37,9 @@ class Asciidoc(AutotoolsPackage): depends_on("docbook-xml", type=("build", "run")) depends_on("docbook-xsl", type=("build", "run")) depends_on("python@3.5:", type=("build", "run")) - depends_on("autoconf", type="build") - depends_on("automake", type="build") - depends_on("libtool", type="build") + with when("build_system=python_pip"): + depends_on("py-setuptools", type="build") + with when("build_system=autotools"): + depends_on("autoconf", type="build") + depends_on("automake", type="build") + depends_on("libtool", type="build") -- cgit v1.2.3-70-g09d2