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

cp2k: fix libs type issue (#46079)

Browse Source 
* Fix CP2K list/LibraryList issue

* [@spackbot] updating style on behalf of etiennemlb
This commit is contained in:
etiennemlb 2024-09-28 19:02:51 +02:00 committed by GitHub
parent e45019f246
commit a8d02bd3b0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
var/spack/repos/builtin/packages/cp2k/package.py
View File

@ -517,12 +517,11 @@ def edit(self, pkg, spec, prefix):
# (short-int vs int) which otherwise causes segfaults at # (short-int vs int) which otherwise causes segfaults at
# runtime due to wrong offsets into the shared library # runtime due to wrong offsets into the shared library
# symbols. # symbols.
libs.extend( libs += [
[
join_path(spec["libint"].libs.directories[0], "libderiv.a"), join_path(spec["libint"].libs.directories[0], "libderiv.a"),
join_path(spec["libint"].libs.directories[0], "libint.a"), join_path(spec["libint"].libs.directories[0], "libint.a"),
] ]
)
else: else:
fcflags += pkgconf("--cflags", "libint2", output=str).split() fcflags += pkgconf("--cflags", "libint2", output=str).split()
libs += pkgconf("--libs", "libint2", output=str).split() libs += pkgconf("--libs", "libint2", output=str).split()
@ -545,18 +544,14 @@ def edit(self, pkg, spec, prefix):
if spec.satisfies("+pexsi"): if spec.satisfies("+pexsi"):
cppflags.append("-D__LIBPEXSI") cppflags.append("-D__LIBPEXSI")
fcflags.append("-I" + join_path(spec["pexsi"].prefix, "fortran")) fcflags.append("-I" + join_path(spec["pexsi"].prefix, "fortran"))
libs.extend( libs += [
[
join_path(spec["pexsi"].libs.directories[0], "libpexsi.a"), join_path(spec["pexsi"].libs.directories[0], "libpexsi.a"),
join_path(spec["superlu-dist"].libs.directories[0], "libsuperlu_dist.a"), join_path(spec["superlu-dist"].libs.directories[0], "libsuperlu_dist.a"),
join_path( join_path(
spec["parmetis"].libs.directories[0], "libparmetis.{0}".format(dso_suffix) spec["parmetis"].libs.directories[0], "libparmetis.{0}".format(dso_suffix)
), ),
join_path( join_path(spec["metis"].libs.directories[0], "libmetis.{0}".format(dso_suffix)),
spec["metis"].libs.directories[0], "libmetis.{0}".format(dso_suffix)
),
] ]
)
if spec.satisfies("+elpa"): if spec.satisfies("+elpa"):
elpa = spec["elpa"] elpa = spec["elpa"]
@ -600,7 +595,7 @@ def edit(self, pkg, spec, prefix):
if spec.satisfies("+plumed"): if spec.satisfies("+plumed"):
dflags.extend(["-D__PLUMED2"]) dflags.extend(["-D__PLUMED2"])
cppflags.extend(["-D__PLUMED2"]) cppflags.extend(["-D__PLUMED2"])
libs.extend([join_path(spec["plumed"].prefix.lib, "libplumed.{0}".format(dso_suffix))]) libs += [join_path(spec["plumed"].prefix.lib, "libplumed.{0}".format(dso_suffix))]
if spec.satisfies("+libvori"): if spec.satisfies("+libvori"):
cppflags += ["-D__LIBVORI"] cppflags += ["-D__LIBVORI"]
@ -628,7 +623,7 @@ def edit(self, pkg, spec, prefix):
lapack = spec["lapack"].libs lapack = spec["lapack"].libs
blas = spec["blas"].libs blas = spec["blas"].libs
ldflags.append((lapack + blas).search_flags) ldflags.append((lapack + blas).search_flags)
libs.extend([str(x) for x in (fftw.libs, lapack, blas)]) libs += [str(x) for x in (fftw.libs, lapack, blas)]
if spec.satisfies("platform=darwin"): if spec.satisfies("platform=darwin"):
cppflags.extend(["-D__NO_STATM_ACCESS"]) cppflags.extend(["-D__NO_STATM_ACCESS"])
@ -642,7 +637,7 @@ def edit(self, pkg, spec, prefix):
# add before ScaLAPACK to override the p?gemm symbols # add before ScaLAPACK to override the p?gemm symbols
cosma = spec["cosma"].libs cosma = spec["cosma"].libs
ldflags.append(cosma.search_flags) ldflags.append(cosma.search_flags)
libs.extend(cosma) libs += cosma
# MPI # MPI
if spec.satisfies("+mpi"): if spec.satisfies("+mpi"):
@ -670,9 +665,9 @@ def edit(self, pkg, spec, prefix):
scalapack = spec["scalapack"].libs scalapack = spec["scalapack"].libs
ldflags.append(scalapack.search_flags) ldflags.append(scalapack.search_flags)
libs.extend(scalapack) libs += scalapack
libs.extend(mpi) libs += mpi
libs.extend(pkg.compiler.stdcxx_libs) libs += pkg.compiler.stdcxx_libs
if spec.satisfies("+mpi_f08"): if spec.satisfies("+mpi_f08"):
cppflags.append("-D__MPI_F08") cppflags.append("-D__MPI_F08")