diff options
| author | takanori-ihara <62980219+takanori-ihara@users.noreply.github.com> | 2021-03-23 16:33:05 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-23 08:33:05 +0100 |
| commit | adf19379cc12bac9e8ce8cf77a545b5786d74471 (patch) | |
| tree | 84425c3b864e9025a3e00fb81a7a52c1595c9ea9 | |
| parent | f57626a7c4a05cc11972a43eba498a943b17a08d (diff) | |
| download | spack-adf19379cc12bac9e8ce8cf77a545b5786d74471.tar.gz spack-adf19379cc12bac9e8ce8cf77a545b5786d74471.tar.bz2 spack-adf19379cc12bac9e8ce8cf77a545b5786d74471.tar.xz spack-adf19379cc12bac9e8ce8cf77a545b5786d74471.zip | |
fujitsu-ssl2: fix to library list and env variables (#22462)
| -rw-r--r-- | var/spack/repos/builtin/packages/fujitsu-ssl2/package.py | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/var/spack/repos/builtin/packages/fujitsu-ssl2/package.py b/var/spack/repos/builtin/packages/fujitsu-ssl2/package.py index 5ad1079815..7e943d4702 100644 --- a/var/spack/repos/builtin/packages/fujitsu-ssl2/package.py +++ b/var/spack/repos/builtin/packages/fujitsu-ssl2/package.py @@ -54,6 +54,9 @@ class FujitsuSsl2(Package): else: libslist.append("libfjlapack.so") + if "+parallel" in spec: # parallel + libslist.extend(["libfjomphk.so", "libfjomp.so"]) + if spec.target == "a64fx": # Build with SVE support if "+parallel" in spec: # parallel libslist.append("libssl2mtexsve.a") @@ -70,7 +73,7 @@ class FujitsuSsl2(Package): else: 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) libs = LibraryList(libspath) @@ -105,6 +108,9 @@ class FujitsuSsl2(Package): ["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 "+parallel" in spec: # parallel libslist.append("libssl2mtexsve.a") @@ -121,7 +127,7 @@ class FujitsuSsl2(Package): else: 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) libs = LibraryList(libspath) @@ -131,9 +137,8 @@ class FujitsuSsl2(Package): def setup_dependent_build_environment(self, env, dependent_spec): path = self.prefix.include env.append_flags( - "fcc_ENV", "-lm -lrt -lpthread -lelf -lz -ldl -idirafter " + path + "fcc_ENV", "-idirafter " + path ) 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") |