hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

remove cray-specific path modifications from pkgconfig providers (now handled in cray platform) (#7406)

Browse source
This commit is contained in:
scheibelp 2018-03-21 11:20:40 -07:00 committed by Adam J. Stewart
parent 500ac793bc
commit 849078e95a
2 changed files with 2 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
var/spack/repos/builtin/packages/pkg-config/package.py
View file

@ -47,10 +47,7 @@ class PkgConfig(AutotoolsPackage):
parallel = False parallel = False
def setup_dependent_environment(self, spack_env, run_env, dependent_spec): def setup_dependent_environment(self, spack_env, run_env, dependent_spec):
"""spack built pkg-config on cray's requires adding /usr/local/ """Adds the ACLOCAL path for autotools."""
and /usr/lib64/ to PKG_CONFIG_PATH in order to access cray '.pc'
files.
Adds the ACLOCAL path for autotools."""
spack_env.append_path('ACLOCAL_PATH', spack_env.append_path('ACLOCAL_PATH',
join_path(self.prefix.share, 'aclocal')) join_path(self.prefix.share, 'aclocal'))

10
var/spack/repos/builtin/packages/pkgconf/package.py
View file

@ -41,17 +41,9 @@ class Pkgconf(AutotoolsPackage):
provides('pkgconfig') provides('pkgconfig')
def setup_dependent_environment(self, spack_env, run_env, dependent_spec): def setup_dependent_environment(self, spack_env, run_env, dependent_spec):
"""spack built pkg-config on cray's requires adding /usr/local/ """Adds the ACLOCAL path for autotools."""
and /usr/lib64/ to PKG_CONFIG_PATH in order to access cray '.pc'
files.
Adds the ACLOCAL path for autotools."""
spack_env.append_path('ACLOCAL_PATH', spack_env.append_path('ACLOCAL_PATH',
join_path(self.prefix.share, 'aclocal')) 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') @run_after('install')
def link_pkg_config(self): def link_pkg_config(self):