From b02340724d43313377e7fa1e48e9fe9ac362bd49 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Mon, 23 Dec 2024 13:57:42 -0600 Subject: [PATCH] gaudi: Fix nonexistent 'libs' (#48274) --- var/spack/repos/builtin/packages/gaudi/package.py | 8 ++++++-- var/spack/repos/builtin/packages/root/package.py | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/var/spack/repos/builtin/packages/gaudi/package.py b/var/spack/repos/builtin/packages/gaudi/package.py index 2ead86b1e49..b7575ced08c 100644 --- a/var/spack/repos/builtin/packages/gaudi/package.py +++ b/var/spack/repos/builtin/packages/gaudi/package.py @@ -169,8 +169,12 @@ def setup_run_environment(self, env): # environment as in Gaudi.xenv env.prepend_path("PATH", self.prefix.scripts) env.prepend_path("PYTHONPATH", self.prefix.python) - for d in self.libs.directories: - env.prepend_path("LD_LIBRARY_PATH", d) + + # Note: ROOT dependency automatically sets up ROOT environment vars + + # ...but Gaudi additionally requires a path variable about itself + for lib_path in [self.prefix.lib, self.prefix.lib64]: + env.prepend_path("LD_LIBRARY_PATH", lib_path) def url_for_version(self, version): major = str(version[0]) diff --git a/var/spack/repos/builtin/packages/root/package.py b/var/spack/repos/builtin/packages/root/package.py index b2adc0ab37e..9f1e7ea80ff 100644 --- a/var/spack/repos/builtin/packages/root/package.py +++ b/var/spack/repos/builtin/packages/root/package.py @@ -869,6 +869,6 @@ def setup_dependent_run_environment( # automatically prepending dependent package library paths to # ROOT_LIBRARY_PATH (for @6.26:) or LD_LIBRARY_PATH (for older # versions). - for lib_path in (dependent_spec.prefix.lib, dependent_spec.prefix.lib64): + for lib_path in [dependent_spec.prefix.lib, dependent_spec.prefix.lib64]: if os.path.exists(lib_path): env.prepend_path(self.root_library_path, lib_path)