Changeset 101929 in webkit
- Timestamp:
- Dec 3, 2011 7:55:51 AM (12 years ago)
- Location:
- trunk/Tools
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r101928 r101929 1 2011-12-03 Martin Robinson <mrobinson@igalia.com> 2 3 Fix jhbuild installation for people who have unusual MAKE environment 4 variables such as 'make -j4' as the jhbuild build does not handle it. 5 6 Reviewed by Gustavo Noronha Silva. 7 8 * gtk/run-with-jhbuild: 9 (install_and_run_jhbuild): Remove any MAKE environment variable before building jhbuild. 10 1 11 2011-12-03 Martin Robinson <mrobinson@igalia.com> 2 12 -
trunk/Tools/gtk/run-with-jhbuild
r101823 r101929 37 37 raise Exception('jhbuild git clone failed with return code: %i' % process.returncode) 38 38 39 process = subprocess.Popen(['./autogen.sh', '--prefix=%s' % installation_prefix], cwd=jhbuild_source_path) 39 # jhbuild is really unhappy about having MAKE defined to something like 'make -j4' 40 # so we just undefine it here. 41 env_without_make = dict(os.environ) 42 del env_without_make['MAKE'] 43 44 process = subprocess.Popen(['./autogen.sh', '--prefix=%s' % installation_prefix], 45 cwd=jhbuild_source_path, env=env_without_make) 40 46 process.wait() 41 47 if process.returncode != 0: 42 48 raise Exception('jhbuild configure failed with return code: %i' % process.returncode) 43 49 44 process = subprocess.Popen(['make', 'install'], cwd=jhbuild_source_path )50 process = subprocess.Popen(['make', 'install'], cwd=jhbuild_source_path, env=env_without_make) 45 51 process.wait() 46 52 if process.returncode != 0:
Note: See TracChangeset
for help on using the changeset viewer.