singularityce: fix after no spaces in Executable allowed (#39553)
This commit is contained in:
parent
696d4a1b85
commit
ed65532e27
@ -79,14 +79,14 @@ def config_options(self):
|
|||||||
# Hijack the edit stage to run mconfig.
|
# Hijack the edit stage to run mconfig.
|
||||||
def edit(self, spec, prefix):
|
def edit(self, spec, prefix):
|
||||||
with working_dir(self.build_directory):
|
with working_dir(self.build_directory):
|
||||||
confstring = "./mconfig --prefix=%s" % prefix
|
_config_options = ["--prefix=%s" % prefix]
|
||||||
confstring += " " + " ".join(self.config_options)
|
_config_options += self.config_options
|
||||||
if "~suid" in spec:
|
if "~suid" in spec:
|
||||||
confstring += " --without-suid"
|
_config_options += " --without-suid"
|
||||||
if "~network" in spec:
|
if "~network" in spec:
|
||||||
confstring += " --without-network"
|
_config_options += " --without-network"
|
||||||
configure = Executable(confstring)
|
configure = Executable("./mconfig")
|
||||||
configure()
|
configure(*_config_options)
|
||||||
|
|
||||||
# Set these for use by MakefilePackage's default build/install methods.
|
# Set these for use by MakefilePackage's default build/install methods.
|
||||||
build_targets = ["-C", "builddir", "parallel=False"]
|
build_targets = ["-C", "builddir", "parallel=False"]
|
||||||
|
Loading…
Reference in New Issue
Block a user