From 1ebf1a0c6c10e8922ac512d24c902e2c97446770 Mon Sep 17 00:00:00 2001 From: "John W. Parent" <45471568+johnwparent@users.noreply.github.com> Date: Tue, 19 Dec 2023 03:34:59 -0500 Subject: libxml2: correct improper use of base builder meta (#41760) --- var/spack/repos/builtin/packages/libxml2/package.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/var/spack/repos/builtin/packages/libxml2/package.py b/var/spack/repos/builtin/packages/libxml2/package.py index ca92e6994a..ede54ae117 100644 --- a/var/spack/repos/builtin/packages/libxml2/package.py +++ b/var/spack/repos/builtin/packages/libxml2/package.py @@ -4,7 +4,6 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) import os -from spack.build_systems import autotools, nmake from spack.package import * @@ -197,7 +196,7 @@ class Libxml2(AutotoolsPackage, NMakePackage): xmllint("--dtdvalid", dtd_path, data_dir.join("info.xml")) -class RunAfter: +class BaseBuilder(metaclass=spack.builder.PhaseCallbacksMeta): @run_after("install") @on_package_attributes(run_tests=True) def import_module_test(self): @@ -206,7 +205,7 @@ class RunAfter: python("-c", "import libxml2") -class AutotoolsBuilder(autotools.AutotoolsBuilder, RunAfter): +class AutotoolsBuilder(BaseBuilder, spack.build_systems.autotools.AutotoolsBuilder): def configure_args(self): spec = self.spec @@ -232,7 +231,7 @@ class AutotoolsBuilder(autotools.AutotoolsBuilder, RunAfter): return args -class NMakeBuilder(nmake.NMakeBuilder, RunAfter): +class NMakeBuilder(BaseBuilder, spack.build_systems.nmake.NMakeBuilder): phases = ("configure", "build", "install") @property -- cgit v1.2.3-70-g09d2