gaudi: Fix nonexistent 'libs' (#48274)

This commit is contained in:
Wouter Deconinck 2024-12-23 13:57:42 -06:00 committed by GitHub
parent 250de0cdf2
commit b02340724d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 3 deletions

View File

@ -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])

View File

@ -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)