hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

added newdtags variant, default to false (i.e., remove --enable-new-dtags)

Browse source
This commit is contained in:
Greg Lee 2016-05-17 21:18:34 -07:00
parent c2ca5f44b4
commit 582d01784a
1 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
var/spack/repos/builtin/packages/intel-parallel-studio/package.py
View file

@ -32,6 +32,8 @@ class IntelParallelStudio(IntelInstaller):
url="file://%s/parallel_studio_xe_2016_update3.tgz" % os.getcwd()) # NOQA: ignore=E501 url="file://%s/parallel_studio_xe_2016_update3.tgz" % os.getcwd()) # NOQA: ignore=E501
variant('rpath', default=True, description="Add rpath to .cfg files") variant('rpath', default=True, description="Add rpath to .cfg files")
variant('newdtags', default=False,
description="Allow use of --enable-new-dtags in MPI wrappers")
variant('all', default=False, variant('all', default=False,
description="Install all files with the requested edition") description="Install all files with the requested edition")
variant('mpi', default=True, variant('mpi', default=True,
@ -116,6 +118,20 @@ def install(self, spec, prefix):
spec.satisfies('@cluster'): spec.satisfies('@cluster'):
os.symlink(self.global_license_file, os.path.join( os.symlink(self.global_license_file, os.path.join(
self.prefix, "itac_latest", "license.lic")) self.prefix, "itac_latest", "license.lic"))
if spec.satisfies('~newdtags'):
wrappers = ["mpif77", "mpif77", "mpif90", "mpif90",
"mpigcc", "mpigcc", "mpigxx", "mpigxx",
"mpiicc", "mpiicc", "mpiicpc", "mpiicpc",
"mpiifort", "mpiifort"]
wrapper_paths = []
for root, dirs, files in os.walk(spec.prefix):
for name in files:
if name in wrappers:
wrapper_paths.append(os.path.join(spec.prefix,
root, name))
for wrapper in wrapper_paths:
filter_file(r'-Xlinker --enable-new-dtags', r' ',
wrapper)
if spec.satisfies('+rpath'): if spec.satisfies('+rpath'):
for compiler_command in ["icc", "icpc", "ifort"]: for compiler_command in ["icc", "icpc", "ifort"]: