summaryrefslogtreecommitdiff
path: root/www/firefox/files/patch-bug1288587
diff options
context:
space:
mode:
Diffstat (limited to 'www/firefox/files/patch-bug1288587')
-rw-r--r--www/firefox/files/patch-bug128858793
1 files changed, 48 insertions, 45 deletions
diff --git a/www/firefox/files/patch-bug1288587 b/www/firefox/files/patch-bug1288587
index f8190a7176e8..9125476c8400 100644
--- a/www/firefox/files/patch-bug1288587
+++ b/www/firefox/files/patch-bug1288587
@@ -2,30 +2,15 @@ diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.confi
index 855214a..1e91d51 100644
--- build/moz.configure/init.configure
+++ build/moz.configure/init.configure
-@@ -165,16 +165,17 @@ option(env='PYTHON', nargs=1, help='Python interpreter')
- # ==============================================================
- @depends('PYTHON', check_build_environment, mozconfig, '--help')
- @imports('os')
- @imports('sys')
- @imports('subprocess')
- @imports(_from='mozbuild.configure.util', _import='LineIO')
+@@ -211,6 +211,7 @@ option(env='PYTHON', nargs=1, help='Python 2.7 interpr
@imports(_from='mozbuild.virtualenv', _import='VirtualenvManager')
@imports(_from='mozbuild.virtualenv', _import='verify_python_version')
+ @imports(_from='mozbuild.virtualenv', _import='PY2')
+@imports(_from='__builtin__', _import='KeyError')
- @imports('distutils.sysconfig')
- def virtualenv_python(env_python, build_env, mozconfig, help):
+ def virtualenv_python2(env_python, build_env, mozconfig, help):
if help:
return
-
- python = env_python[0] if env_python else None
-
- # Ideally we'd rely on the mozconfig injection from mozconfig_options,
-@@ -184,16 +185,22 @@ def virtualenv_python(env_python, build_env, mozconfig, help):
- if 'PYTHON' in mozconfig['env']['added']:
- python = mozconfig['env']['added']['PYTHON']
- elif 'PYTHON' in mozconfig['env']['modified']:
- python = mozconfig['env']['modified']['PYTHON'][1]
- elif 'PYTHON' in mozconfig['vars']['added']:
+@@ -242,6 +243,12 @@ def virtualenv_python2(env_python, build_env, mozconfi
python = mozconfig['vars']['added']['PYTHON']
elif 'PYTHON' in mozconfig['vars']['modified']:
python = mozconfig['vars']['modified']['PYTHON'][1]
@@ -36,32 +21,50 @@ index 855214a..1e91d51 100644
+ except KeyError:
+ pass
- with LineIO(lambda l: log.error(l)) as out:
- verify_python_version(out)
- topsrcdir, topobjdir = build_env.topsrcdir, build_env.topobjdir
- if topobjdir.endswith('/js/src'):
- topobjdir = topobjdir[:-7]
-
- with LineIO(lambda l: log.info(l)) as out:
-@@ -255,17 +262,20 @@ def virtualenv_python(env_python, build_env, mozconfig
- log.info('Creating Python environment')
- manager.build(python)
+ log.debug("python2: executable from configuration: %r" % python)
- python = normsep(manager.python_path)
-
- if not normsep(sys.executable).startswith(normsep(virtualenvs_root)):
- log.info('Reexecuting in the virtualenv')
- if env_python:
-- del os.environ['PYTHON']
-+ try:
-+ del os.environ['PYTHON']
-+ except KeyError:
-+ pass
- # One would prefer to use os.execl, but that's completely borked on
- # Windows.
- sys.exit(subprocess.call([python] + sys.argv))
+@@ -294,7 +301,10 @@ def virtualenv_python2(env_python, build_env, mozconfi
+ sys.executable, manager.python_path))
+ log.info('Reexecuting in the virtualenv')
+ if env_python:
+- del os.environ['PYTHON']
++ try:
++ del os.environ['PYTHON']
++ except KeyError:
++ pass
+ # One would prefer to use os.execl, but that's completely borked on
+ # Windows.
+ sys.exit(subprocess.call([python] + sys.argv))
+@@ -430,6 +440,7 @@ option(env='PYTHON3', nargs=1, help='Python 3 interpre
+ @imports(_from='mozbuild.virtualenv', _import='PY3')
+ @imports(_from='mozbuild.pythonutil', _import='find_python3_executable')
+ @imports(_from='mozbuild.pythonutil', _import='python_executable_version')
++@imports(_from='__builtin__', _import='KeyError')
+ def virtualenv_python3(env_python, build_env, mozillabuild, mozconfig, help):
+ if help:
+ return
+@@ -465,6 +476,12 @@ def virtualenv_python3(env_python, build_env, mozillab
+ python = mozconfig['vars']['added']['PYTHON3']
+ elif 'PYTHON3' in mozconfig['vars']['modified']:
+ python = mozconfig['vars']['modified']['PYTHON3'][1]
++ for i in ('env', 'vars'):
++ for j in ('added', 'modified'):
++ try:
++ del mozconfig[i][j]['PYTHON3']
++ except KeyError:
++ pass
- # We are now in the virtualenv
- if not distutils.sysconfig.get_python_lib():
- die('Could not determine python site packages directory')
+ log.debug("python3: executable from configuration: %r" % python)
+@@ -545,7 +562,10 @@ def virtualenv_python3(env_python, build_env, mozillab
+ sys.executable, manager.python_path))
+ log.info('Re-executing in the virtualenv')
+ if env_python:
+- del os.environ['PYTHON3']
++ try:
++ del os.environ['PYTHON3']
++ except KeyError:
++ pass
+ # One would prefer to use os.execl, but that's completely borked on
+ # Windows.
+ sys.exit(subprocess.call([python] + sys.argv))