zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fujitsu-ssl2: fix to library list and env variables (#22462)

Browse Source
This commit is contained in:
takanori-ihara 2021-03-23 16:33:05 +09:00 committed by GitHub
parent f57626a7c4
commit adf19379cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
var/spack/repos/builtin/packages/fujitsu-ssl2/package.py
View File

@ -54,6 +54,9 @@ def blas_libs(self):
else: else:
libslist.append("libfjlapack.so") libslist.append("libfjlapack.so")
if "+parallel" in spec: # parallel
libslist.extend(["libfjomphk.so", "libfjomp.so"])
if spec.target == "a64fx": # Build with SVE support if spec.target == "a64fx": # Build with SVE support
if "+parallel" in spec: # parallel if "+parallel" in spec: # parallel
libslist.append("libssl2mtexsve.a") libslist.append("libssl2mtexsve.a")
@ -70,7 +73,7 @@ def blas_libs(self):
else: else:
libslist.append("libfj90fmt.a") libslist.append("libfj90fmt.a")
libslist.extend(["libfj90f.a", "libfjsrcinfo.a", "libfj90rt.so"]) libslist.extend(["libfj90f.so", "libfjsrcinfo.so", "libfj90rt.so"])
libspath = find(self.prefix.lib64, libslist, recursive=False) libspath = find(self.prefix.lib64, libslist, recursive=False)
libs = LibraryList(libspath) libs = LibraryList(libspath)
@ -105,6 +108,9 @@ def scalapack_libs(self):
["libmpi_usempi_ignore_tkr.so", "libmpi_mpifh.so"] ["libmpi_usempi_ignore_tkr.so", "libmpi_mpifh.so"]
) )
if "+parallel" in spec: # parallel
libslist.extend(["libfjomphk.so", "libfjomp.so"])
if spec.target == "a64fx": # Build with SVE support if spec.target == "a64fx": # Build with SVE support
if "+parallel" in spec: # parallel if "+parallel" in spec: # parallel
libslist.append("libssl2mtexsve.a") libslist.append("libssl2mtexsve.a")
@ -121,7 +127,7 @@ def scalapack_libs(self):
else: else:
libslist.append("libfj90fmt.a") libslist.append("libfj90fmt.a")
libslist.extend(["libfj90f.a", "libfjsrcinfo.a", "libfj90rt.so"]) libslist.extend(["libfj90f.so", "libfjsrcinfo.so", "libfj90rt.so"])
libspath = find(self.prefix.lib64, libslist, recursive=False) libspath = find(self.prefix.lib64, libslist, recursive=False)
libs = LibraryList(libspath) libs = LibraryList(libspath)
@ -131,9 +137,8 @@ def scalapack_libs(self):
def setup_dependent_build_environment(self, env, dependent_spec): def setup_dependent_build_environment(self, env, dependent_spec):
path = self.prefix.include path = self.prefix.include
env.append_flags( env.append_flags(
"fcc_ENV", "-lm -lrt -lpthread -lelf -lz -ldl -idirafter " + path "fcc_ENV", "-idirafter " + path
) )
env.append_flags( env.append_flags(
"FCC_ENV", "-lm -lrt -lpthread -lelf -lz -ldl -idirafter " + path "FCC_ENV", "-idirafter " + path
) )
env.append_flags("FORT90C", "-lm -lrt -lpthread -lelf -lz -ldl")