diff options
| author | Mario Melara <maamelara@gmail.com> | 2018-03-05 12:08:11 -0800 |
|---|---|---|
| committer | scheibelp <scheibel1@llnl.gov> | 2018-03-05 12:08:11 -0800 |
| commit | ccb24b1438e82f7a89cde2fb468b02668d644a62 (patch) | |
| tree | 54f6b9b03b682bfcba8c8c4c0f7e0e16fc67c237 | |
| parent | 89a591eb3b9b497640e3dc873599186939be802a (diff) | |
| download | spack-ccb24b1438e82f7a89cde2fb468b02668d644a62.tar.gz spack-ccb24b1438e82f7a89cde2fb468b02668d644a62.tar.bz2 spack-ccb24b1438e82f7a89cde2fb468b02668d644a62.tar.xz spack-ccb24b1438e82f7a89cde2fb468b02668d644a62.zip | |
Fix pkgconf on Crays (#7171)
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).
| -rw-r--r-- | lib/spack/spack/platforms/cray.py | 3 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/pkg-config/package.py | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/lib/spack/spack/platforms/cray.py b/lib/spack/spack/platforms/cray.py index 095a426b22..e6e9685f74 100644 --- a/lib/spack/spack/platforms/cray.py +++ b/lib/spack/spack/platforms/cray.py @@ -108,6 +108,9 @@ class Cray(Platform): 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): diff --git a/var/spack/repos/builtin/packages/pkg-config/package.py b/var/spack/repos/builtin/packages/pkg-config/package.py index 44e03c7401..0d9fceec6e 100644 --- a/var/spack/repos/builtin/packages/pkg-config/package.py +++ b/var/spack/repos/builtin/packages/pkg-config/package.py @@ -53,11 +53,6 @@ class PkgConfig(AutotoolsPackage): 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'] |