summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Haines <thaines.astro@gmail.com>2024-10-31 10:24:06 -0500
committerGitHub <noreply@github.com>2024-10-31 09:24:06 -0600
commita08b4ae53838afc6e7b57b99b299daf2cfeca997 (patch)
tree6d8f4ab9625186bd1ba7e4fd811123ab4f9bc25f
parent404b1c6c199a42ff4575841ede9afa4992ca050a (diff)
downloadspack-a08b4ae53838afc6e7b57b99b299daf2cfeca997.tar.gz
spack-a08b4ae53838afc6e7b57b99b299daf2cfeca997.tar.bz2
spack-a08b4ae53838afc6e7b57b99b299daf2cfeca997.tar.xz
spack-a08b4ae53838afc6e7b57b99b299daf2cfeca997.zip
extrae: update checksums, fix build (-lintl), minor modernisation (#47343)
Co-authored-by: Bernhard Kaindl <bernhardkaindl7@gmail.com>
-rw-r--r--var/spack/repos/builtin/packages/extrae/package.py27
1 files changed, 15 insertions, 12 deletions
diff --git a/var/spack/repos/builtin/packages/extrae/package.py b/var/spack/repos/builtin/packages/extrae/package.py
index a89c67e921..24f12bba59 100644
--- a/var/spack/repos/builtin/packages/extrae/package.py
+++ b/var/spack/repos/builtin/packages/extrae/package.py
@@ -43,17 +43,17 @@ class Extrae(AutotoolsPackage):
license("LGPL-2.1-or-later")
version("4.1.2", sha256="adbc1d3aefde7649262426d471237dc96f070b93be850a6f15280ed86fd0b952")
- version("4.0.6", sha256="b5060336cac57f1345faa09009b1940edf1e6991aae05cc10d0b714d31360a92")
+ version("4.0.6", sha256="233be38035dd76f6877b1fd93d308e024e5d4ef5519d289f8e319cd6c58d0bc6")
version("4.0.5", sha256="8f5eefa95f2e94a3b5f9b7f7cbaaed523862f190575ee797113b1e97deff1586")
- version("4.0.4", sha256="003bede870de6d88b705c1a13eabe63b6beb928d8f389f5dd70ca5db8450a1f9")
- version("4.0.3", sha256="b5139a07dbb1f4aa9758c1d62d54e42c01125bcfa9aa0cb9ee4f863afae93db1")
- version("3.8.3", sha256="c3bf27fb6f18e66200e40a0b4c35bc257766e5c1a525dc5725f561879e88bf32")
+ version("4.0.4", sha256="b867d395c344020c04e6630e9bfc10bf126e093df989d5563a2f3a6bc7568224")
+ version("4.0.3", sha256="0d87509ec03584a629a879dccea10cf334f8243004077f6af3745aabb31e7250")
+ version("3.8.3", sha256="a05e40891104e73e1019b193002dea39e5c3177204ea04495716511ddfd639cf")
version("3.7.1", sha256="c83ddd18a380c9414d64ee5de263efc6f7bac5fe362d5b8374170c7f18360378")
version("3.4.1", sha256="77bfec16d6b5eee061fbaa879949dcef4cad28395d6a546b1ae1b9246f142725")
- depends_on("c", type="build") # generated
- depends_on("cxx", type="build") # generated
- depends_on("fortran", type="build") # generated
+ depends_on("c", type="build")
+ depends_on("cxx", type="build")
+ depends_on("fortran", type="build")
depends_on("autoconf", type="build")
depends_on("automake", type="build")
@@ -116,27 +116,27 @@ class Extrae(AutotoolsPackage):
args += (
["--with-papi=%s" % spec["papi"].prefix]
- if "+papi" in self.spec
+ if spec.satisfies("+papi")
else ["--without-papi"]
)
args += (
["--with-dyninst=%s" % spec["dyninst"].prefix]
- if "+dyninst" in self.spec
+ if spec.satisfies("+dyninst")
else ["--without-dyninst"]
)
args += (
["--with-cuda=%s" % spec["cuda"].prefix]
- if "+cuda" in self.spec
+ if spec.satisifes("+cuda")
else ["--without-cuda"]
)
- if self.spec.satisfies("+cupti"):
+ if spec.satisfies("+cupti"):
cupti_h = find_headers("cupti", spec["cuda"].prefix, recursive=True)
cupti_dir = os.path.dirname(os.path.dirname(cupti_h[0]))
- args += ["--with-cupti=%s" % cupti_dir] if "+cupti" in self.spec else ["--without-cupti"]
+ args += ["--with-cupti=%s" % cupti_dir] if "+cupti" in spec else ["--without-cupti"]
if spec.satisfies("^dyninst@9.3.0:"):
make.add_default_arg("CXXFLAGS=%s" % self.compiler.cxx11_flag)
@@ -144,6 +144,9 @@ class Extrae(AutotoolsPackage):
args.extend(self.enable_or_disable("single-mpi-lib"))
+ # Library dir of -lintl as provided by gettext to be independent on the system's libintl
+ args.append(f"LDFLAGS=-L{spec['gettext'].prefix.lib}")
+
return args
def flag_handler(self, name, flags):