[jhbuild] cmake: allow substituion of libsuffix variable (GNOME bug 674010)



commit 1a24440667b0696096a4ce7800ada2b80a9e8e89
Author: Craig Keogh <cskeogh adam com au>
Date:   Mon May 21 22:22:24 2012 +0930

    cmake: allow substituion of libsuffix variable (GNOME bug 674010)
    
    Patch based upon patch by Marc-Andre Lureau.

 jhbuild/modtypes/cmake.py |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)
---
diff --git a/jhbuild/modtypes/cmake.py b/jhbuild/modtypes/cmake.py
index b30ac6c..9297da8 100644
--- a/jhbuild/modtypes/cmake.py
+++ b/jhbuild/modtypes/cmake.py
@@ -47,6 +47,14 @@ class CMakeModule(Package, DownloadableModule):
         self.supports_non_srcdir_builds = True
         self.supports_install_destdir = True
 
+    def eval_args(self, args):
+        args = Package.eval_args(self, args)
+        libsuffix = ''
+        if self.config.use_lib64:
+            libsuffix = '64'
+        args = args.replace('${libsuffix}', libsuffix)
+        return args
+
     def get_srcdir(self, buildscript):
         return self.branch.srcdir
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]