libxml2: correct improper use of base builder meta (#41760)

This commit is contained in:
John W. Parent 2023-12-19 03:34:59 -05:00 committed by GitHub
parent 56761649a2
commit 1ebf1a0c6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -4,7 +4,6 @@
# SPDX-License-Identifier: (Apache-2.0 OR MIT) # SPDX-License-Identifier: (Apache-2.0 OR MIT)
import os import os
from spack.build_systems import autotools, nmake
from spack.package import * from spack.package import *
@ -197,7 +196,7 @@ def test_xmllint(self):
xmllint("--dtdvalid", dtd_path, data_dir.join("info.xml")) xmllint("--dtdvalid", dtd_path, data_dir.join("info.xml"))
class RunAfter: class BaseBuilder(metaclass=spack.builder.PhaseCallbacksMeta):
@run_after("install") @run_after("install")
@on_package_attributes(run_tests=True) @on_package_attributes(run_tests=True)
def import_module_test(self): def import_module_test(self):
@ -206,7 +205,7 @@ def import_module_test(self):
python("-c", "import libxml2") python("-c", "import libxml2")
class AutotoolsBuilder(autotools.AutotoolsBuilder, RunAfter): class AutotoolsBuilder(BaseBuilder, spack.build_systems.autotools.AutotoolsBuilder):
def configure_args(self): def configure_args(self):
spec = self.spec spec = self.spec
@ -232,7 +231,7 @@ def configure_args(self):
return args return args
class NMakeBuilder(nmake.NMakeBuilder, RunAfter): class NMakeBuilder(BaseBuilder, spack.build_systems.nmake.NMakeBuilder):
phases = ("configure", "build", "install") phases = ("configure", "build", "install")
@property @property