diff options
author | Patrick Gartung <gartung@fnal.gov> | 2018-03-08 22:18:55 -0600 |
---|---|---|
committer | scheibelp <scheibel1@llnl.gov> | 2018-03-08 20:18:55 -0800 |
commit | 331f5f27eb51340978c920a4b86ea9dcc625a854 (patch) | |
tree | 20df9addcf067d3eec5ad385cc96557a3471f7d6 /var | |
parent | 74bb15285baa765077ecc3b6fc57fd6bf0f74971 (diff) | |
download | spack-331f5f27eb51340978c920a4b86ea9dcc625a854.tar.gz spack-331f5f27eb51340978c920a4b86ea9dcc625a854.tar.bz2 spack-331f5f27eb51340978c920a4b86ea9dcc625a854.tar.xz spack-331f5f27eb51340978c920a4b86ea9dcc625a854.zip |
lua package: add lib64 to LUA_PATH and LUA_CPATH (#7434)
This is needed when using system lua on RHEL and clones where lua
is installed in /usr/lib64. Note that the path entry for lua in
packages.yaml should specify the major/minor version of lua (since
this is used to calculate the lua lib directory)
Diffstat (limited to 'var')
-rw-r--r-- | var/spack/repos/builtin/packages/lua/package.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/lua/package.py b/var/spack/repos/builtin/packages/lua/package.py index 46d1e5c094..763f6c5cbe 100644 --- a/var/spack/repos/builtin/packages/lua/package.py +++ b/var/spack/repos/builtin/packages/lua/package.py @@ -102,6 +102,7 @@ class Lua(Package): deptypes=('build', 'run'), deptype_query='run'): if d.package.extends(self.spec): lua_paths.append(os.path.join(d.prefix, self.lua_lib_dir)) + lua_paths.append(os.path.join(d.prefix, self.lua64_lib_dir)) lua_paths.append(os.path.join(d.prefix, self.lua_share_dir)) lua_patterns = [] @@ -112,6 +113,7 @@ class Lua(Package): # Always add this package's paths for p in (os.path.join(self.spec.prefix, self.lua_lib_dir), + os.path.join(self.spec.prefix, self.lua_lib64_dir), os.path.join(self.spec.prefix, self.lua_share_dir)): self.append_paths(lua_patterns, lua_cpatterns, p) @@ -156,6 +158,10 @@ class Lua(Package): return os.path.join('lib', 'lua', str(self.version.up_to(2))) @property + def lua_lib64_dir(self): + return os.path.join('lib64', 'lua', str(self.version.up_to(2))) + + @property def lua_share_dir(self): return os.path.join('share', 'lua', str(self.version.up_to(2))) |