From bf8fea1d53a34214b9ecec1298af011b7d58f74f Mon Sep 17 00:00:00 2001
From: G-Ragghianti <33492707+G-Ragghianti@users.noreply.github.com>
Date: Fri, 3 Apr 2020 16:48:44 -0400
Subject: Added support for new config process for papi@6:+lmsensors (#15858)

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

* Removed extraneous blank lines
---
 var/spack/repos/builtin/packages/papi/package.py | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

(limited to 'var')

diff --git a/var/spack/repos/builtin/packages/papi/package.py b/var/spack/repos/builtin/packages/papi/package.py
index f82f319fa0..7ec1217640 100644
--- a/var/spack/repos/builtin/packages/papi/package.py
+++ b/var/spack/repos/builtin/packages/papi/package.py
@@ -46,15 +46,24 @@ class Papi(Package):
     # 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:')
 
+    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):
         if '+lmsensors' in spec:
-            with working_dir("src/components/lmsensors"):
-                configure_args = [
-                    "--with-sensors_incdir=%s/sensors" %
-                    spec['lm-sensors'].headers.directories[0],
-                    "--with-sensors_libdir=%s" %
-                    spec['lm-sensors'].libs.directories[0]]
-                configure(*configure_args)
+            if self.version < Version('6'):
+                with working_dir("src/components/lmsensors"):
+                    configure_args = [
+                        "--with-sensors_incdir=%s/sensors" %
+                        spec['lm-sensors'].headers.directories[0],
+                        "--with-sensors_libdir=%s" %
+                        spec['lm-sensors'].libs.directories[0]]
+                    configure(*configure_args)
         with working_dir("src"):
 
             configure_args = ["--prefix=%s" % prefix]
-- 
cgit v1.2.3-70-g09d2