diff options
| author | Michael Kuhn <suraia@ikkoku.de> | 2017-06-09 14:12:27 +0200 |
|---|---|---|
| committer | Adam J. Stewart <ajstewart426@gmail.com> | 2017-06-09 07:12:27 -0500 |
| commit | 23a95de2bd66e4a40387cbe2a05e132ccb07bf49 (patch) | |
| tree | 4299ed6ed928e702a04ce931b3e7b72adbec4eb2 | |
| parent | 5c5fd4a7e38aada4f0ca8d39394c457dbc1ecc5e (diff) | |
| download | spack-23a95de2bd66e4a40387cbe2a05e132ccb07bf49.tar.gz spack-23a95de2bd66e4a40387cbe2a05e132ccb07bf49.tar.bz2 spack-23a95de2bd66e4a40387cbe2a05e132ccb07bf49.tar.xz spack-23a95de2bd66e4a40387cbe2a05e132ccb07bf49.zip | |
Fix autotools issues (#4463)
Add ACLOCAL_PATH to libtool and pkg-config. Without this, aclocal can
not find the .m4 files.
| -rw-r--r-- | var/spack/repos/builtin/packages/libtool/package.py | 4 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/pkg-config/package.py | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/libtool/package.py b/var/spack/repos/builtin/packages/libtool/package.py index ae706089c9..f0a7de3798 100644 --- a/var/spack/repos/builtin/packages/libtool/package.py +++ b/var/spack/repos/builtin/packages/libtool/package.py @@ -41,6 +41,10 @@ class Libtool(AutotoolsPackage): def _make_executable(self, name): return Executable(join_path(self.prefix.bin, name)) + def setup_dependent_environment(self, spack_env, run_env, dependent_spec): + spack_env.append_path('ACLOCAL_PATH', + join_path(self.prefix.share, 'aclocal')) + def setup_dependent_package(self, module, dependent_spec): # Automake is very likely to be a build dependency, # so we add the tools it provides to the dependent module diff --git a/var/spack/repos/builtin/packages/pkg-config/package.py b/var/spack/repos/builtin/packages/pkg-config/package.py index 0aa4bb9969..2e23aae3fe 100644 --- a/var/spack/repos/builtin/packages/pkg-config/package.py +++ b/var/spack/repos/builtin/packages/pkg-config/package.py @@ -51,6 +51,8 @@ class PkgConfig(AutotoolsPackage): files.""" spack_env.append_path('PKG_CONFIG_PATH', '/usr/lib64/pkgconfig') spack_env.append_path('PKG_CONFIG_PATH', '/usr/local/lib64/pkgconfig') + spack_env.append_path('ACLOCAL_PATH', + join_path(self.prefix.share, 'aclocal')) def configure_args(self): config_args = ['--enable-shared'] |