summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/gptune/package.py1
-rw-r--r--var/spack/repos/builtin/packages/llvm/package.py8
-rw-r--r--var/spack/repos/builtin/packages/perl/package.py11
-rw-r--r--var/spack/repos/builtin/packages/python/package.py11
-rw-r--r--var/spack/repos/builtin/packages/ruby/package.py5
-rw-r--r--var/spack/repos/builtin/packages/tcl/package.py26
6 files changed, 25 insertions, 37 deletions
diff --git a/var/spack/repos/builtin/packages/gptune/package.py b/var/spack/repos/builtin/packages/gptune/package.py
index 2affba20ef..c0c321c9a4 100644
--- a/var/spack/repos/builtin/packages/gptune/package.py
+++ b/var/spack/repos/builtin/packages/gptune/package.py
@@ -52,6 +52,7 @@ class Gptune(CMakePackage):
depends_on("py-pyaml", type=("build", "run"))
depends_on("py-statsmodels@0.13.0:", type=("build", "run"))
depends_on("py-mpi4py@3.0.3:", type=("build", "run"))
+ depends_on("python", type=("build", "run"))
depends_on("pygmo", type=("build", "run"))
depends_on("openturns", type=("build", "run"))
depends_on("py-pymoo", type=("build", "run"), when="@3.0.0:")
diff --git a/var/spack/repos/builtin/packages/llvm/package.py b/var/spack/repos/builtin/packages/llvm/package.py
index b7a78c6fdd..7e110a248e 100644
--- a/var/spack/repos/builtin/packages/llvm/package.py
+++ b/var/spack/repos/builtin/packages/llvm/package.py
@@ -752,14 +752,6 @@ class Llvm(CMakePackage, CudaPackage):
os.symlink(bin, sym)
env.prepend_path("PATH", self.stage.path)
- def setup_run_environment(self, env):
- if "+clang" in self.spec:
- env.set("CC", join_path(self.spec.prefix.bin, "clang"))
- env.set("CXX", join_path(self.spec.prefix.bin, "clang++"))
- if "+flang" in self.spec:
- env.set("FC", join_path(self.spec.prefix.bin, "flang"))
- env.set("F77", join_path(self.spec.prefix.bin, "flang"))
-
root_cmakelists_dir = "llvm"
def cmake_args(self):
diff --git a/var/spack/repos/builtin/packages/perl/package.py b/var/spack/repos/builtin/packages/perl/package.py
index bffaf875a2..7a4e15c1f7 100644
--- a/var/spack/repos/builtin/packages/perl/package.py
+++ b/var/spack/repos/builtin/packages/perl/package.py
@@ -401,14 +401,13 @@ class Perl(Package): # Perl doesn't use Autotools, it should subclass Package
maker()
maker("install")
- def _setup_dependent_env(self, env, dependent_spec, deptype):
+ def _setup_dependent_env(self, env, dependent_spec):
"""Set PATH and PERL5LIB to include the extension and
any other perl extensions it depends on,
assuming they were installed with INSTALL_BASE defined."""
perl_lib_dirs = []
- for d in dependent_spec.traverse(deptype=deptype):
- if d.package.extends(self.spec):
- perl_lib_dirs.append(d.prefix.lib.perl5)
+ if dependent_spec.package.extends(self.spec):
+ perl_lib_dirs.append(dependent_spec.prefix.lib.perl5)
if perl_lib_dirs:
perl_lib_path = ":".join(perl_lib_dirs)
env.prepend_path("PERL5LIB", perl_lib_path)
@@ -416,10 +415,10 @@ class Perl(Package): # Perl doesn't use Autotools, it should subclass Package
env.append_path("PATH", self.prefix.bin)
def setup_dependent_build_environment(self, env, dependent_spec):
- self._setup_dependent_env(env, dependent_spec, deptype=("build", "run", "test"))
+ self._setup_dependent_env(env, dependent_spec)
def setup_dependent_run_environment(self, env, dependent_spec):
- self._setup_dependent_env(env, dependent_spec, deptype=("run",))
+ self._setup_dependent_env(env, dependent_spec)
def setup_dependent_package(self, module, dependent_spec):
"""Called before perl modules' install() methods.
diff --git a/var/spack/repos/builtin/packages/python/package.py b/var/spack/repos/builtin/packages/python/package.py
index 59306d8f23..83dbfb382f 100644
--- a/var/spack/repos/builtin/packages/python/package.py
+++ b/var/spack/repos/builtin/packages/python/package.py
@@ -1244,12 +1244,11 @@ print(json.dumps(config))
"""Set PYTHONPATH to include the site-packages directory for the
extension and any other python extensions it depends on.
"""
- for d in dependent_spec.traverse(deptype=("run"), root=True):
- if d.package.extends(self.spec):
- # Packages may be installed in platform-specific or platform-independent
- # site-packages directories
- for directory in {self.platlib, self.purelib}:
- env.prepend_path("PYTHONPATH", os.path.join(d.prefix, directory))
+ if dependent_spec.package.extends(self.spec):
+ # Packages may be installed in platform-specific or platform-independent
+ # site-packages directories
+ for directory in {self.platlib, self.purelib}:
+ env.prepend_path("PYTHONPATH", os.path.join(dependent_spec.prefix, directory))
def setup_dependent_package(self, module, dependent_spec):
"""Called before python modules' install() methods."""
diff --git a/var/spack/repos/builtin/packages/ruby/package.py b/var/spack/repos/builtin/packages/ruby/package.py
index 60cbc76cd8..694c2551e1 100644
--- a/var/spack/repos/builtin/packages/ruby/package.py
+++ b/var/spack/repos/builtin/packages/ruby/package.py
@@ -83,9 +83,8 @@ class Ruby(AutotoolsPackage, NMakePackage):
return url.format(version.up_to(2), version)
def setup_dependent_run_environment(self, env, dependent_spec):
- for d in dependent_spec.traverse(deptype=("run"), root=True):
- if d.package.extends(self.spec):
- env.prepend_path("GEM_PATH", d.prefix)
+ if dependent_spec.package.extends(self.spec):
+ env.prepend_path("GEM_PATH", dependent_spec.prefix)
def setup_dependent_package(self, module, dependent_spec):
"""Called before ruby modules' install() methods. Sets GEM_HOME
diff --git a/var/spack/repos/builtin/packages/tcl/package.py b/var/spack/repos/builtin/packages/tcl/package.py
index 33bff65e25..c0082dc52c 100644
--- a/var/spack/repos/builtin/packages/tcl/package.py
+++ b/var/spack/repos/builtin/packages/tcl/package.py
@@ -151,13 +151,12 @@ class Tcl(AutotoolsPackage, SourceforgePackage):
# https://core.tcl-lang.org/tk/tktview/447bd3e4abe17452d19a80e6840dcc8a2603fcbc
env.prepend_path("TCLLIBPATH", self.spec["tcl"].libs.directories[0], separator=" ")
- for d in dependent_spec.traverse(deptype=("build", "run", "test")):
- if d.package.extends(self.spec):
- # Tcl libraries may be installed in lib or lib64, see #19546
- for lib in ["lib", "lib64"]:
- tcllibpath = join_path(d.prefix, lib)
- if os.path.exists(tcllibpath):
- env.prepend_path("TCLLIBPATH", tcllibpath, separator=" ")
+ if dependent_spec.package.extends(self.spec):
+ # Tcl libraries may be installed in lib or lib64, see #19546
+ for lib in ["lib", "lib64"]:
+ tcllibpath = join_path(dependent_spec.prefix, lib)
+ if os.path.exists(tcllibpath):
+ env.prepend_path("TCLLIBPATH", tcllibpath, separator=" ")
def setup_dependent_run_environment(self, env, dependent_spec):
"""Set TCLLIBPATH to include the tcl-shipped directory for
@@ -167,10 +166,9 @@ class Tcl(AutotoolsPackage, SourceforgePackage):
* https://wiki.tcl-lang.org/page/TCLLIBPATH
"""
- for d in dependent_spec.traverse(deptype=("build", "run", "test")):
- if d.package.extends(self.spec):
- # Tcl libraries may be installed in lib or lib64, see #19546
- for lib in ["lib", "lib64"]:
- tcllibpath = join_path(d.prefix, lib)
- if os.path.exists(tcllibpath):
- env.prepend_path("TCLLIBPATH", tcllibpath, separator=" ")
+ if dependent_spec.package.extends(self.spec):
+ # Tcl libraries may be installed in lib or lib64, see #19546
+ for lib in ["lib", "lib64"]:
+ tcllibpath = join_path(dependent_spec.prefix, lib)
+ if os.path.exists(tcllibpath):
+ env.prepend_path("TCLLIBPATH", tcllibpath, separator=" ")
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-07-01 09:07:21 +0000