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

Fix autotools issues (#4463)

Browse Source 
Add ACLOCAL_PATH to libtool and pkg-config. Without this, aclocal can
not find the .m4 files.
This commit is contained in:
Michael Kuhn 2017-06-09 14:12:27 +02:00 committed by Adam J. Stewart
parent 5c5fd4a7e3
commit 23a95de2bd
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
var/spack/repos/builtin/packages/libtool/package.py
View File

@ -41,6 +41,10 @@ class Libtool(AutotoolsPackage):
def _make_executable(self, name): def _make_executable(self, name):
return Executable(join_path(self.prefix.bin, 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): def setup_dependent_package(self, module, dependent_spec):
# Automake is very likely to be a build dependency, # Automake is very likely to be a build dependency,
# so we add the tools it provides to the dependent module # so we add the tools it provides to the dependent module

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

@ -51,6 +51,8 @@ def setup_dependent_environment(self, spack_env, run_env, dependent_spec):
files.""" files."""
spack_env.append_path('PKG_CONFIG_PATH', '/usr/lib64/pkgconfig') 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('PKG_CONFIG_PATH', '/usr/local/lib64/pkgconfig')
spack_env.append_path('ACLOCAL_PATH',
join_path(self.prefix.share, 'aclocal'))
def configure_args(self): def configure_args(self):
config_args = ['--enable-shared'] config_args = ['--enable-shared']