Title: [101929] trunk/Tools
- Revision
- 101929
- Author
- [email protected]
- Date
- 2011-12-03 07:55:51 -0800 (Sat, 03 Dec 2011)
Log Message
Fix jhbuild installation for people who have unusual MAKE environment
variables such as 'make -j4' as the jhbuild build does not handle it.
Reviewed by Gustavo Noronha Silva.
* gtk/run-with-jhbuild:
(install_and_run_jhbuild): Remove any MAKE environment variable before building jhbuild.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (101928 => 101929)
--- trunk/Tools/ChangeLog 2011-12-03 15:39:02 UTC (rev 101928)
+++ trunk/Tools/ChangeLog 2011-12-03 15:55:51 UTC (rev 101929)
@@ -1,5 +1,15 @@
2011-12-03 Martin Robinson <[email protected]>
+ Fix jhbuild installation for people who have unusual MAKE environment
+ variables such as 'make -j4' as the jhbuild build does not handle it.
+
+ Reviewed by Gustavo Noronha Silva.
+
+ * gtk/run-with-jhbuild:
+ (install_and_run_jhbuild): Remove any MAKE environment variable before building jhbuild.
+
+2011-12-03 Martin Robinson <[email protected]>
+
Fix the update-webkitgtk-libs script to properly trigger a jhbuild installation
when run for the first time.
Modified: trunk/Tools/gtk/run-with-jhbuild (101928 => 101929)
--- trunk/Tools/gtk/run-with-jhbuild 2011-12-03 15:39:02 UTC (rev 101928)
+++ trunk/Tools/gtk/run-with-jhbuild 2011-12-03 15:55:51 UTC (rev 101929)
@@ -36,12 +36,18 @@
if process.returncode != 0:
raise Exception('jhbuild git clone failed with return code: %i' % process.returncode)
- process = subprocess.Popen(['./autogen.sh', '--prefix=%s' % installation_prefix], cwd=jhbuild_source_path)
+ # jhbuild is really unhappy about having MAKE defined to something like 'make -j4'
+ # so we just undefine it here.
+ env_without_make = dict(os.environ)
+ del env_without_make['MAKE']
+
+ process = subprocess.Popen(['./autogen.sh', '--prefix=%s' % installation_prefix],
+ cwd=jhbuild_source_path, env=env_without_make)
process.wait()
if process.returncode != 0:
raise Exception('jhbuild configure failed with return code: %i' % process.returncode)
- process = subprocess.Popen(['make', 'install'], cwd=jhbuild_source_path)
+ process = subprocess.Popen(['make', 'install'], cwd=jhbuild_source_path, env=env_without_make)
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
