[gentoo-commits] proj/auto-numerical-bench:unstable commit in: /

["Andrea Arteaga" <andyspiros@gmail.com>]

commit:     e5a2c34a80bc1cfd984789f8c82a84c70c19f8bb
Author:     Andrea Arteaga <andyspiros <AT> gmail <DOT> com>
AuthorDate: Mon Aug  8 11:50:33 2011 +0000
Commit:     Andrea Arteaga <andyspiros <AT> gmail <DOT> com>
CommitDate: Mon Aug  8 11:50:33 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/auto-numerical-bench.git;a=commit;h=e5a2c34a

Solve a PBLAS block issue. Log the pkg-config runs.

---
 basemodule.py |    6 ++++++
 pblas.py      |    2 +-
 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/basemodule.py b/basemodule.py
index 8a1d180..b55adfc 100644
--- a/basemodule.py
+++ b/basemodule.py
@@ -181,9 +181,13 @@ class BaseTest:
         # 1. Run with no requires
         pfile = pc.GetFile(self.libname, self.impl, self.root)
         flags = pc.Run(pfile, self.root, False)
+        logfile = file(pjoin(self.logdir, 'pkg-config.log'), 'w')
+        print >> logfile, "File:", pfile
+        print >> logfile, "Result:", flags
         
         # 2. Get requires
         requires = pc.Requires(pfile)
+        print >> logfile, "Requires:", requires
         
         # 3.Substitute requires and add flags
         for r in requires:
@@ -192,6 +196,8 @@ class BaseTest:
                 flags += ' ' + pc.Run(pfile)
             else:
                 flags += ' ' + pc.Run(r)
+        print >> logfile, "Third run:", flags
+        logfile.close()
         
         return shlex.split(flags)
     

diff --git a/pblas.py b/pblas.py
index 64d1eb7..e4a7d73 100644
--- a/pblas.py
+++ b/pblas.py
@@ -62,7 +62,7 @@ class PBLASTest(btlbase.BTLTest):
     
     @staticmethod
     def _btl_includes():
-        return ["libs/BLAS", "libs/BLACS", "libs/PBLAS", "libs/STL"]
+        return ["libs/"+i for i in ("BLAS", "LAPACK", "BLACS", "PBLAS", "STL")]
     
     def _btl_defines(self):
         return ["PBLASNAME="+self.libname]
\ No newline at end of file