Title: [116878] releases/WebKitGTK/webkit-1.8/Tools
- Revision
- 116878
- Author
- [email protected]
- Date
- 2012-05-13 06:41:40 -0700 (Sun, 13 May 2012)
Log Message
Merge 112153 - [jhbuild] Use $MAKE if it is defined to build jhbuild itself.
https://bugs.webkit.org/show_bug.cgi?id=82209
Reviewed by Martin Robinson.
Respecting the $MAKE environment variable when it is defined makes
building jhbuild more portable, as some platforms may have GNU
make as gmake, for example.
* jhbuild/jhbuild-wrapper:
(install_jhbuild):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-1.8/Tools/ChangeLog (116877 => 116878)
--- releases/WebKitGTK/webkit-1.8/Tools/ChangeLog 2012-05-13 13:41:27 UTC (rev 116877)
+++ releases/WebKitGTK/webkit-1.8/Tools/ChangeLog 2012-05-13 13:41:40 UTC (rev 116878)
@@ -1,5 +1,19 @@
2012-03-26 Raphael Kubo da Costa <[email protected]>
+ [jhbuild] Use $MAKE if it is defined to build jhbuild itself.
+ https://bugs.webkit.org/show_bug.cgi?id=82209
+
+ Reviewed by Martin Robinson.
+
+ Respecting the $MAKE environment variable when it is defined makes
+ building jhbuild more portable, as some platforms may have GNU
+ make as gmake, for example.
+
+ * jhbuild/jhbuild-wrapper:
+ (install_jhbuild):
+
+2012-03-26 Raphael Kubo da Costa <[email protected]>
+
[jhbuild] Revert $MAKE environment hack introduced in r101929.
https://bugs.webkit.org/show_bug.cgi?id=82234
Modified: releases/WebKitGTK/webkit-1.8/Tools/jhbuild/jhbuild-wrapper (116877 => 116878)
--- releases/WebKitGTK/webkit-1.8/Tools/jhbuild/jhbuild-wrapper 2012-05-13 13:41:27 UTC (rev 116877)
+++ releases/WebKitGTK/webkit-1.8/Tools/jhbuild/jhbuild-wrapper 2012-05-13 13:41:40 UTC (rev 116878)
@@ -18,6 +18,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
import os
+import shlex
import subprocess
import sys
@@ -90,7 +91,11 @@
if process.returncode != 0:
raise Exception('jhbuild configure failed with return code: %i' % process.returncode)
- process = subprocess.Popen(['make', 'install'], cwd=jhbuild_source_path)
+ # This is a hackish approach to make the subprocess.Popen call even when people set
+ # MAKE to 'make -j3' instead of using the MAKEFLAGS environment variable.
+ make = shlex.split(os.environ.get('MAKE', 'make'))
+
+ process = subprocess.Popen(make + ['install'], cwd=jhbuild_source_path)
process.wait()
if process.returncode != 0:
raise Exception('jhbuild configure failed with return code: %i' % process.returncode)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
