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

Added support for new config process for papi@6:+lmsensors (#15858)

Browse Source 
* Added support for new configuration process of lmsensors component for papi@6:

* Removed extraneous blank lines
This commit is contained in:
G-Ragghianti 2020-04-03 16:48:44 -04:00 committed by GitHub
parent 4173c27868
commit bf8fea1d53
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
var/spack/repos/builtin/packages/papi/package.py
View File

@ -46,15 +46,24 @@ class Papi(Package):
# https://bitbucket.org/icl/papi/issues/46/cannot-compile-on-arch-linux # https://bitbucket.org/icl/papi/issues/46/cannot-compile-on-arch-linux
patch('https://bitbucket.org/icl/papi/commits/53de184a162b8a7edff48fed01a15980664e15b1/raw', sha256='64c57b3ad4026255238cc495df6abfacc41de391a0af497c27d0ac819444a1f8', when='@5.4.0:5.6.99%gcc@8:') patch('https://bitbucket.org/icl/papi/commits/53de184a162b8a7edff48fed01a15980664e15b1/raw', sha256='64c57b3ad4026255238cc495df6abfacc41de391a0af497c27d0ac819444a1f8', when='@5.4.0:5.6.99%gcc@8:')
def setup_build_environment(self, env):
if '+lmsensors' in self.spec and self.version >= Version('6'):
env.set('PAPI_LMSENSORS_ROOT', self.spec['lm-sensors'].prefix)
def setup_run_environment(self, env):
if '+lmsensors' in self.spec and self.version >= Version('6'):
env.set('PAPI_LMSENSORS_ROOT', self.spec['lm-sensors'].prefix)
def install(self, spec, prefix): def install(self, spec, prefix):
if '+lmsensors' in spec: if '+lmsensors' in spec:
with working_dir("src/components/lmsensors"): if self.version < Version('6'):
configure_args = [ with working_dir("src/components/lmsensors"):
"--with-sensors_incdir=%s/sensors" % configure_args = [
spec['lm-sensors'].headers.directories[0], "--with-sensors_incdir=%s/sensors" %
"--with-sensors_libdir=%s" % spec['lm-sensors'].headers.directories[0],
spec['lm-sensors'].libs.directories[0]] "--with-sensors_libdir=%s" %
configure(*configure_args) spec['lm-sensors'].libs.directories[0]]
configure(*configure_args)
with working_dir("src"): with working_dir("src"):
configure_args = ["--prefix=%s" % prefix] configure_args = ["--prefix=%s" % prefix]