From 0aab6068ff2212f3d66609b342678d495ad139c8 Mon Sep 17 00:00:00 2001
From: G-Ragghianti <33492707+G-Ragghianti@users.noreply.github.com>
Date: Mon, 25 Nov 2019 14:42:14 -0700
Subject: Improved library access for lm-sensors and implemented use in papi.
 (#13885)

* Improved library access for lm-sensors and implemented use in papi.

* Fixed comment formatting

* Removed explicit "None" from return of libs().

* Added two new software release versions.
---
 var/spack/repos/builtin/packages/lm-sensors/package.py | 7 +++++++
 var/spack/repos/builtin/packages/papi/package.py       | 8 ++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

(limited to 'var')

diff --git a/var/spack/repos/builtin/packages/lm-sensors/package.py b/var/spack/repos/builtin/packages/lm-sensors/package.py
index 39e2f2b75d..d3da135250 100644
--- a/var/spack/repos/builtin/packages/lm-sensors/package.py
+++ b/var/spack/repos/builtin/packages/lm-sensors/package.py
@@ -14,6 +14,8 @@ class LmSensors(MakefilePackage):
     url = "https://github.com/groeck/lm-sensors/archive/V3-4-0.tar.gz"
     maintainers = ['G-Ragghianti']
 
+    version('3-6-0', sha256='0591f9fa0339f0d15e75326d0365871c2d4e2ed8aa1ff759b3a55d3734b7d197')
+    version('3-5-0', sha256='f671c1d63a4cd8581b3a4a775fd7864a740b15ad046fe92038bcff5c5134d7e0')
     version('3-4-0', sha256='e334c1c2b06f7290e3e66bdae330a5d36054701ffd47a5dde7a06f9a7402cb4e')
     version('3-3-5', sha256='e3802f80785c54822027a8c187b10066ba685ec5e997fd02c1d29761ea9c83d4')
     version('3-3-4', sha256='1c586684b39292b5fabaf5a2701241885ea6483e5e15265e1f501e1b639fdd86')
@@ -32,3 +34,8 @@ class LmSensors(MakefilePackage):
     def install(self, spec, prefix):
         make('install', 'PREFIX={0}'.format(prefix),
              'ETCDIR={0}/etc'.format(prefix))
+
+    @property
+    def libs(self):
+        return find_libraries(
+            'libsensors', root=self.prefix, shared=True, recursive=True)
diff --git a/var/spack/repos/builtin/packages/papi/package.py b/var/spack/repos/builtin/packages/papi/package.py
index caef44ad31..40cde37481 100644
--- a/var/spack/repos/builtin/packages/papi/package.py
+++ b/var/spack/repos/builtin/packages/papi/package.py
@@ -47,10 +47,10 @@ class Papi(Package):
         if '+lmsensors' in spec:
             with working_dir("src/components/lmsensors"):
                 configure_args = [
-                    "--with-sensors_incdir=%s/include/sensors" %
-                    spec['lm-sensors'].prefix,
-                    "--with-sensors_libdir=%s/lib" %
-                    spec['lm-sensors'].prefix]
+                    "--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"):
 
-- 
cgit v1.2.3-70-g09d2