[jhbuild] cmake: remove whitespace from make command



commit 891b79b2ff270627904c9d2a823262289bc24762
Author: Marcin Wojdyr <wojdyr gmail com>
Date:   Wed Feb 15 17:38:52 2012 +0000

    cmake: remove whitespace from make command
    
    If an extra space is added ("make  -j2") make fails on Windows with:
    make: *** empty string invalid as file name.
    This is a workaround. strip() is also used in corresponding place in
    autotools.py
    
    https://bugzilla.gnome.org/show_bug.cgi?id=670094

 jhbuild/modtypes/cmake.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/jhbuild/modtypes/cmake.py b/jhbuild/modtypes/cmake.py
index d71b02b..6a4de06 100644
--- a/jhbuild/modtypes/cmake.py
+++ b/jhbuild/modtypes/cmake.py
@@ -81,7 +81,7 @@ class CMakeModule(Package, DownloadableModule):
             if ' -j' not in args:
                 arg = '-j %s' % (self.config.jobs, )
                 args = args + ' ' + arg
-        return self.eval_args(args)
+        return self.eval_args(args).strip()
 
     def skip_configure(self, buildscript, last_phase):
         return buildscript.config.nobuild



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