mpi: remove setting unused monkey patched variable (#48275)
mpicxx_shared_libraries seems a relic of #1550, and is not currently used by any builtin package. Thus, cleanup the recipes, and avoid monkey-patching spec objects.
This commit is contained in:
parent
c65a0e03c4
commit
aca469b329
@ -53,11 +53,6 @@ def setup_dependent_package(self, module, dependent_spec):
|
||||
spec.mpifc = dependent_module.spack_fc
|
||||
spec.mpif77 = dependent_module.spack_f77
|
||||
|
||||
spec.mpicxx_shared_libs = [
|
||||
join_path(self.prefix.lib, "libmpicxx.{0}".format(dso_suffix)),
|
||||
join_path(self.prefix.lib, "libmpi.{0}".format(dso_suffix)),
|
||||
]
|
||||
|
||||
def install(self, spec, prefix):
|
||||
raise InstallError(
|
||||
self.spec.format(
|
||||
|
@ -8,7 +8,6 @@
|
||||
import sys
|
||||
|
||||
import spack.compilers
|
||||
from spack.build_environment import dso_suffix
|
||||
from spack.package import *
|
||||
|
||||
|
||||
@ -482,11 +481,6 @@ def setup_dependent_package(self, module, dependent_spec):
|
||||
spec.mpifc = join_path(self.prefix.bin, "mpif90")
|
||||
spec.mpif77 = join_path(self.prefix.bin, "mpif77")
|
||||
|
||||
spec.mpicxx_shared_libs = [
|
||||
join_path(self.prefix.lib, "libmpicxx.{0}".format(dso_suffix)),
|
||||
join_path(self.prefix.lib, "libmpi.{0}".format(dso_suffix)),
|
||||
]
|
||||
|
||||
def autoreconf(self, spec, prefix):
|
||||
"""Not needed usually, configure should be already there"""
|
||||
# If configure exists nothing needs to be done
|
||||
|
@ -4,7 +4,6 @@
|
||||
# SPDX-License-Identifier: (Apache-2.0 OR MIT)
|
||||
|
||||
import itertools
|
||||
import os.path
|
||||
import re
|
||||
import sys
|
||||
|
||||
@ -242,10 +241,6 @@ def setup_dependent_package(self, module, dependent_spec):
|
||||
self.spec.mpicxx = join_path(self.prefix.bin, "mpicxx")
|
||||
self.spec.mpifc = join_path(self.prefix.bin, "mpif90")
|
||||
self.spec.mpif77 = join_path(self.prefix.bin, "mpif77")
|
||||
self.spec.mpicxx_shared_libs = [
|
||||
os.path.join(self.prefix.lib, "libmpicxx.{0}".format(dso_suffix)),
|
||||
os.path.join(self.prefix.lib, "libmpi.{0}".format(dso_suffix)),
|
||||
]
|
||||
|
||||
@run_before("configure")
|
||||
def die_without_fortran(self):
|
||||
|
@ -3,7 +3,6 @@
|
||||
#
|
||||
# SPDX-License-Identifier: (Apache-2.0 OR MIT)
|
||||
|
||||
import os.path
|
||||
import sys
|
||||
|
||||
from spack.package import *
|
||||
@ -184,10 +183,6 @@ def setup_dependent_package(self, module, dependent_spec):
|
||||
self.spec.mpicxx = join_path(self.prefix.bin, "mpicxx")
|
||||
self.spec.mpifc = join_path(self.prefix.bin, "mpif90")
|
||||
self.spec.mpif77 = join_path(self.prefix.bin, "mpif77")
|
||||
self.spec.mpicxx_shared_libs = [
|
||||
os.path.join(self.prefix.lib, "libmpicxx.{0}".format(dso_suffix)),
|
||||
os.path.join(self.prefix.lib, "libmpi.{0}".format(dso_suffix)),
|
||||
]
|
||||
|
||||
def configure_args(self):
|
||||
spec = self.spec
|
||||
|
@ -399,10 +399,6 @@ def setup_dependent_package(self, module, dependent_spec):
|
||||
self.spec.mpicxx = join_path(self.prefix.bin, "mpicxx")
|
||||
self.spec.mpifc = join_path(self.prefix.bin, "mpif90")
|
||||
self.spec.mpif77 = join_path(self.prefix.bin, "mpif77")
|
||||
self.spec.mpicxx_shared_libs = [
|
||||
os.path.join(self.prefix.lib, "libmpicxx.{0}".format(dso_suffix)),
|
||||
os.path.join(self.prefix.lib, "libmpi.{0}".format(dso_suffix)),
|
||||
]
|
||||
|
||||
@run_before("configure")
|
||||
def die_without_fortran(self):
|
||||
|
@ -3,7 +3,6 @@
|
||||
#
|
||||
# SPDX-License-Identifier: (Apache-2.0 OR MIT)
|
||||
|
||||
import os.path
|
||||
import sys
|
||||
|
||||
from spack.package import *
|
||||
@ -239,10 +238,6 @@ def setup_dependent_package(self, module, dependent_spec):
|
||||
self.spec.mpicxx = join_path(self.prefix.bin, "mpicxx")
|
||||
self.spec.mpifc = join_path(self.prefix.bin, "mpif90")
|
||||
self.spec.mpif77 = join_path(self.prefix.bin, "mpif77")
|
||||
self.spec.mpicxx_shared_libs = [
|
||||
os.path.join(self.prefix.lib, "libmpicxx.{0}".format(dso_suffix)),
|
||||
os.path.join(self.prefix.lib, "libmpi.{0}".format(dso_suffix)),
|
||||
]
|
||||
|
||||
def configure_args(self):
|
||||
spec = self.spec
|
||||
|
@ -931,10 +931,6 @@ def setup_dependent_package(self, module, dependent_spec):
|
||||
self.spec.mpicxx = join_path(self.prefix.bin, "mpic++")
|
||||
self.spec.mpifc = join_path(self.prefix.bin, "mpif90")
|
||||
self.spec.mpif77 = join_path(self.prefix.bin, "mpif77")
|
||||
self.spec.mpicxx_shared_libs = [
|
||||
join_path(self.prefix.lib, "libmpi_cxx.{0}".format(dso_suffix)),
|
||||
join_path(self.prefix.lib, "libmpi.{0}".format(dso_suffix)),
|
||||
]
|
||||
|
||||
# Most of the following with_or_without methods might seem redundant
|
||||
# because Spack compiler wrapper adds the required -I and -L flags, which
|
||||
|
@ -93,11 +93,6 @@ def setup_dependent_package(self, module, dependent_spec):
|
||||
self.spec.mpifc = join_path(self.prefix.bin, "mpif90")
|
||||
self.spec.mpif77 = join_path(self.prefix.bin, "mpif77")
|
||||
|
||||
self.spec.mpicxx_shared_libs = [
|
||||
join_path(self.prefix.lib, "libmpicxx.{0}".format(dso_suffix)),
|
||||
join_path(self.prefix.lib, "libmpi.{0}".format(dso_suffix)),
|
||||
]
|
||||
|
||||
def autoreconf(self, spec, prefix):
|
||||
"""Not needed usually, configure should be already there"""
|
||||
# If configure exists nothing needs to be done
|
||||
|
Loading…
Reference in New Issue
Block a user