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

Fix pkgconf on Crays (#7171)

Browse Source 
This updates Cray.setup_platform_environment to use cray-specific
pkgconfig paths so that all providers of 'pkgconfig' have access
to them (previously the 'pkg-config' provider had this but the
'pkgconf' provider did not).
This commit is contained in:
Mario Melara 2018-03-05 12:08:11 -08:00 committed by scheibelp
parent 89a591eb3b
commit ccb24b1438
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/spack/spack/platforms/cray.py
View File

@ -108,6 +108,9 @@ def setup_platform_environment(cls, pkg, env):
if os.path.isdir(cray_wrapper_names):
env.prepend_path('PATH', cray_wrapper_names)
env.prepend_path('SPACK_ENV_PATH', cray_wrapper_names)
# Makes spack installed pkg-config work on Crays
env.append_path("PKG_CONFIG_PATH", "/usr/lib64/pkgconfig")
env.append_path("PKG_CONFIG_PATH", "/usr/local/lib64/pkgconfig")
@classmethod
def detect(cls):

5
var/spack/repos/builtin/packages/pkg-config/package.py
View File

@ -53,11 +53,6 @@ def setup_dependent_environment(self, spack_env, run_env, dependent_spec):
Adds the ACLOCAL path for autotools."""
spack_env.append_path('ACLOCAL_PATH',
join_path(self.prefix.share, 'aclocal'))
if 'platform=cray' in self.spec:
spack_env.append_path('PKG_CONFIG_PATH',
'/usr/lib64/pkgconfig')
spack_env.append_path('PKG_CONFIG_PATH',
'/usr/local/lib64/pkgconfig')
def configure_args(self):
config_args = ['--enable-shared']