Add missing import to packages (#41791)
This commit is contained in:
parent
7e2e063979
commit
20572fb87b
@ -4,6 +4,7 @@
|
||||
# SPDX-License-Identifier: (Apache-2.0 OR MIT)
|
||||
|
||||
|
||||
from spack.build_systems import makefile
|
||||
from spack.package import *
|
||||
|
||||
|
||||
@ -21,7 +22,7 @@ class Fpocket(MakefilePackage):
|
||||
depends_on("qhull")
|
||||
|
||||
|
||||
class MakefileBuilder(spack.build_systems.makefile.MakefileBuilder):
|
||||
class MakefileBuilder(makefile.MakefileBuilder):
|
||||
def setup_build_environment(self, env):
|
||||
if self.pkg.compiler.name == "gcc":
|
||||
env.set("CXX", "g++")
|
||||
|
@ -6,6 +6,7 @@
|
||||
import os
|
||||
import socket
|
||||
|
||||
import spack.platforms.cray
|
||||
from spack.package import *
|
||||
|
||||
|
||||
|
@ -4,6 +4,8 @@
|
||||
# SPDX-License-Identifier: (Apache-2.0 OR MIT)
|
||||
import os
|
||||
|
||||
import spack.builder
|
||||
from spack.build_systems import autotools, nmake
|
||||
from spack.package import *
|
||||
|
||||
|
||||
@ -205,7 +207,7 @@ def import_module_test(self):
|
||||
python("-c", "import libxml2")
|
||||
|
||||
|
||||
class AutotoolsBuilder(BaseBuilder, spack.build_systems.autotools.AutotoolsBuilder):
|
||||
class AutotoolsBuilder(BaseBuilder, autotools.AutotoolsBuilder):
|
||||
def configure_args(self):
|
||||
spec = self.spec
|
||||
|
||||
@ -231,7 +233,7 @@ def configure_args(self):
|
||||
return args
|
||||
|
||||
|
||||
class NMakeBuilder(BaseBuilder, spack.build_systems.nmake.NMakeBuilder):
|
||||
class NMakeBuilder(BaseBuilder, nmake.NMakeBuilder):
|
||||
phases = ("configure", "build", "install")
|
||||
|
||||
@property
|
||||
|
@ -5,7 +5,6 @@
|
||||
|
||||
|
||||
from spack.package import *
|
||||
from spack.util.executable import ProcessError
|
||||
|
||||
|
||||
class SmeeClient(Package):
|
||||
@ -35,7 +34,7 @@ def build(self, spec, prefix):
|
||||
# Allow tsc to fail with typing "errors" which don't affect results
|
||||
output = npm("run", "build", output=str, error=str, fail_on_error=False)
|
||||
if npm.returncode not in (0, 2):
|
||||
raise ProcessError(output)
|
||||
raise InstallError(output)
|
||||
|
||||
def install(self, spec, prefix):
|
||||
npm = which("npm", required=True)
|
||||
|
Loading…
Reference in New Issue
Block a user