diff options
| author | Axel Huebl <axel.huebl@plasma.ninja> | 2017-07-17 15:40:22 +0200 |
|---|---|---|
| committer | Adam J. Stewart <ajstewart426@gmail.com> | 2017-07-17 08:40:22 -0500 |
| commit | febf41e0e2ced27e6ea78cef731840e57cf83c88 (patch) | |
| tree | 083475c21c65f162678e9352d29d8b8a3d69afd9 | |
| parent | 7e32756fceec665199242830493bfd12d3c23458 (diff) | |
| download | spack-febf41e0e2ced27e6ea78cef731840e57cf83c88.tar.gz spack-febf41e0e2ced27e6ea78cef731840e57cf83c88.tar.bz2 spack-febf41e0e2ced27e6ea78cef731840e57cf83c88.tar.xz spack-febf41e0e2ced27e6ea78cef731840e57cf83c88.zip | |
pkg-config: aclocal env (#4736)
Always sets the `pkg-config` environment hint for
autotools.
Required dependency for `autoreconf` of ZeroMQ when
build from source (e.g. v4.2.2) via autotools in `autogen.sh`
step for `autoreconf`.
| -rw-r--r-- | var/spack/repos/builtin/packages/pkg-config/package.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/pkg-config/package.py b/var/spack/repos/builtin/packages/pkg-config/package.py index dfb6608cf3..39306e33cd 100644 --- a/var/spack/repos/builtin/packages/pkg-config/package.py +++ b/var/spack/repos/builtin/packages/pkg-config/package.py @@ -44,15 +44,18 @@ class PkgConfig(AutotoolsPackage): parallel = False - @when('platform=cray') 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.""" - spack_env.append_path('PKG_CONFIG_PATH', '/usr/lib64/pkgconfig') - spack_env.append_path('PKG_CONFIG_PATH', '/usr/local/lib64/pkgconfig') + files. + 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'] |