Title: [112139] trunk/Tools
- Revision
- 112139
- Author
- [email protected]
- Date
- 2012-03-26 12:31:02 -0700 (Mon, 26 Mar 2012)
Log Message
[jhbuild] Revert $MAKE environment hack introduced in r101929.
https://bugs.webkit.org/show_bug.cgi?id=82234
Reviewed by Martin Robinson.
The problem it was supposedly fixing was fixed in jhbuild itself
in git revision da8944d8ca987ca48c91b350257a530050406092, so we
can remove the workaround added to the script.
* jhbuild/jhbuild-wrapper:
(install_jhbuild):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (112138 => 112139)
--- trunk/Tools/ChangeLog 2012-03-26 19:28:44 UTC (rev 112138)
+++ trunk/Tools/ChangeLog 2012-03-26 19:31:02 UTC (rev 112139)
@@ -1,3 +1,17 @@
+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
+
+ Reviewed by Martin Robinson.
+
+ The problem it was supposedly fixing was fixed in jhbuild itself
+ in git revision da8944d8ca987ca48c91b350257a530050406092, so we
+ can remove the workaround added to the script.
+
+ * jhbuild/jhbuild-wrapper:
+ (install_jhbuild):
+
2012-03-26 Leo Yang <[email protected]>
[BlackBerry] Skeleton code of AsyncFileSystemBlackBerry.cpp
Modified: trunk/Tools/jhbuild/jhbuild-wrapper (112138 => 112139)
--- trunk/Tools/jhbuild/jhbuild-wrapper 2012-03-26 19:28:44 UTC (rev 112138)
+++ trunk/Tools/jhbuild/jhbuild-wrapper 2012-03-26 19:31:02 UTC (rev 112139)
@@ -85,19 +85,12 @@
def install_jhbuild():
- # 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)
- if 'MAKE' in env_without_make:
- del env_without_make['MAKE']
-
- process = subprocess.Popen(['bash', './autogen.sh', '--prefix=%s' % installation_prefix],
- cwd=jhbuild_source_path, env=env_without_make)
+ process = subprocess.Popen(['bash', './autogen.sh', '--prefix=%s' % installation_prefix], cwd=jhbuild_source_path)
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, env=env_without_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
