diff options
| author | scheibelp <scheibel1@llnl.gov> | 2018-03-21 11:20:40 -0700 |
|---|---|---|
| committer | Adam J. Stewart <ajstewart426@gmail.com> | 2018-03-21 13:20:40 -0500 |
| commit | 849078e95a167c7f3b7110157e90c5a6acafe935 (patch) | |
| tree | 684370732acac2dc51f03df301357c70fcc8ff08 /var | |
| parent | 500ac793bc5753a64e9d196b6888bd141ae41aa5 (diff) | |
| download | spack-849078e95a167c7f3b7110157e90c5a6acafe935.tar.gz spack-849078e95a167c7f3b7110157e90c5a6acafe935.tar.bz2 spack-849078e95a167c7f3b7110157e90c5a6acafe935.tar.xz spack-849078e95a167c7f3b7110157e90c5a6acafe935.zip | |
remove cray-specific path modifications from pkgconfig providers (now handled in cray platform) (#7406)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/pkg-config/package.py | 5 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/pkgconf/package.py | 10 |
2 files changed, 2 insertions, 13 deletions
diff --git a/var/spack/repos/builtin/packages/pkg-config/package.py b/var/spack/repos/builtin/packages/pkg-config/package.py index 0d9fceec6e..08cbc27c56 100644 --- a/var/spack/repos/builtin/packages/pkg-config/package.py +++ b/var/spack/repos/builtin/packages/pkg-config/package.py @@ -47,10 +47,7 @@ class PkgConfig(AutotoolsPackage): parallel = False def setup_dependent_environment(self, spack_env, run_env, dependent_spec): - """spack built pkg-config on cray's requires adding /usr/local/ - and /usr/lib64/ to PKG_CONFIG_PATH in order to access cray '.pc' - files. - Adds the ACLOCAL path for autotools.""" + """Adds the ACLOCAL path for autotools.""" spack_env.append_path('ACLOCAL_PATH', join_path(self.prefix.share, 'aclocal')) diff --git a/var/spack/repos/builtin/packages/pkgconf/package.py b/var/spack/repos/builtin/packages/pkgconf/package.py index d0cf6eb899..2d264626dd 100644 --- a/var/spack/repos/builtin/packages/pkgconf/package.py +++ b/var/spack/repos/builtin/packages/pkgconf/package.py @@ -41,17 +41,9 @@ class Pkgconf(AutotoolsPackage): provides('pkgconfig') def setup_dependent_environment(self, spack_env, run_env, dependent_spec): - """spack built pkg-config on cray's requires adding /usr/local/ - and /usr/lib64/ to PKG_CONFIG_PATH in order to access cray '.pc' - files. - Adds the ACLOCAL path for autotools.""" + """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') @run_after('install') def link_pkg_config(self): |