Changeset 112139 in webkit

Timestamp:

Mar 26, 2012 12:31:02 PM (12 years ago)

Author:

kubo@profusion.mobi

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):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• jhbuild/jhbuild-wrapper (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-03-26  Raphael Kubo da Costa  <rakuco@FreeBSD.org>
+
+        [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  <leo.yang@torchmobile.com.cn>
 

trunk/Tools/jhbuild/jhbuild-wrapper

@@ -86 +86 @@
 
 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: