zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #849 from brettviren/bugfix/share-pkgconfig

Browse Source 
Add  to sub dirs checked for pkg-config files.
This commit is contained in:
Todd Gamblin 2016-05-10 00:59:01 -07:00
commit cbfba84aa2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/spack/spack/build_environment.py
View File

@ -175,8 +175,8 @@ def set_build_environment_variables(pkg, env):
# Add any pkgconfig directories to PKG_CONFIG_PATH # Add any pkgconfig directories to PKG_CONFIG_PATH
pkg_config_dirs = [] pkg_config_dirs = []
for p in dep_prefixes: for p in dep_prefixes:
for libdir in ('lib', 'lib64'): for maybe in ('lib', 'lib64', 'share'):
pcdir = join_path(p, libdir, 'pkgconfig') pcdir = join_path(p, maybe, 'pkgconfig')
if os.path.isdir(pcdir): if os.path.isdir(pcdir):
pkg_config_dirs.append(pcdir) pkg_config_dirs.append(pcdir)
env.set_path('PKG_CONFIG_PATH', pkg_config_dirs) env.set_path('PKG_CONFIG_PATH', pkg_config_dirs)