bug1762050 pushed to autoland

3 files changed, 2 insertions, 91 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a2c8c208248d..ec983bfdfd0c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -58,10 +58,8 @@ pkgbase = firefox-wayland-hg
 	source = hg+https://hg.mozilla.org/mozilla-unified#revision=autoland
 	source = firefox.desktop
 	source = firefox-symbolic.svg
-	source = bug1762050.diff
 	sha256sums = SKIP
 	sha256sums = a9e5264257041c0b968425b5c97436ba48e8d294e1a0f02c59c35461ea245c33
 	sha256sums = 9a1a572dc88014882d54ba2d3079a1cf5b28fa03c5976ed2cb763c93dabbd797
-	sha256sums = 0bbfdc3765d8495d0dae918cf1d3a532346ff63f8b8d127b74ff075be87594ca
 
 pkgname = firefox-wayland-hg
diff --git a/PKGBUILD b/PKGBUILD
index 2654631721da..57395abe178a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -31,11 +31,10 @@ _repo=https://hg.mozilla.org/mozilla-unified
 conflicts=('firefox')
 provides=('firefox')
 source=("hg+$_repo#revision=autoland"
-        $_pkgname.desktop $_pkgname-symbolic.svg bug1762050.diff)
+        $_pkgname.desktop $_pkgname-symbolic.svg)
 sha256sums=('SKIP'
             'a9e5264257041c0b968425b5c97436ba48e8d294e1a0f02c59c35461ea245c33'
-            '9a1a572dc88014882d54ba2d3079a1cf5b28fa03c5976ed2cb763c93dabbd797'
-            '0bbfdc3765d8495d0dae918cf1d3a532346ff63f8b8d127b74ff075be87594ca')
+            '9a1a572dc88014882d54ba2d3079a1cf5b28fa03c5976ed2cb763c93dabbd797')
 
 # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
 # Note: These are for Arch Linux use ONLY. For your own distribution, please
diff --git a/bug1762050.diff b/bug1762050.diff
deleted file mode 100644
index 721d11d52308..000000000000
--- a/bug1762050.diff
+++ /dev/null
@@ -1,86 +0,0 @@
-diff --git a/python/mozbuild/mozbuild/build_commands.py b/python/mozbuild/mozbuild/build_commands.py
---- a/python/mozbuild/mozbuild/build_commands.py
-+++ b/python/mozbuild/mozbuild/build_commands.py
-@@ -183,10 +183,11 @@
-             directory=directory,
-             verbose=verbose,
-             keep_going=keep_going,
-             mach_context=command_context._mach_context,
-             append_env=append_env,
-+            virtualenv_topobjdir=orig_topobjdir,
-         )
-         if status != 0:
-             return status
- 
-         # Packaging the instrumented build is required to get the jarlog
-@@ -206,11 +207,11 @@
-             pgo_env["LLVM_PROFDATA"] = instr.config_environment.substs.get(
-                 "LLVM_PROFDATA"
-             )
-         pgo_env["JARLOG_FILE"] = mozpath.join(orig_topobjdir, "jarlog/en-US.log")
-         pgo_cmd = [
--            instr.virtualenv_manager.python_path,
-+            command_context.virtualenv_manager.python_path,
-             mozpath.join(command_context.topsrcdir, "build/pgo/profileserver.py"),
-         ]
-         subprocess.check_call(pgo_cmd, cwd=instr.topobjdir, env=pgo_env)
- 
-         # Set the default build to MOZ_PROFILE_USE
-diff --git a/python/mozbuild/mozbuild/controller/building.py b/python/mozbuild/mozbuild/controller/building.py
---- a/python/mozbuild/mozbuild/controller/building.py
-+++ b/python/mozbuild/mozbuild/controller/building.py
-@@ -1219,10 +1219,11 @@
-         directory=None,
-         verbose=False,
-         keep_going=False,
-         mach_context=None,
-         append_env=None,
-+        virtualenv_topobjdir=None,
-     ):
-         """Invoke the build backend.
- 
-         ``what`` defines the thing to build. If not defined, the default
-         target is used.
-@@ -1296,10 +1297,11 @@
-                 config_rc = self.configure(
-                     metrics,
-                     buildstatus_messages=True,
-                     line_handler=output.on_line,
-                     append_env=append_env,
-+                    virtualenv_topobjdir=virtualenv_topobjdir,
-                 )
- 
-                 if config_rc != 0:
-                     return config_rc
- 
-@@ -1634,10 +1636,11 @@
-         metrics,
-         options=None,
-         buildstatus_messages=False,
-         line_handler=None,
-         append_env=None,
-+        virtualenv_topobjdir=None,
-     ):
-         # Disable indexing in objdir because it is not necessary and can slow
-         # down builds.
-         self.metrics = metrics
-         mkdir(self.topobjdir, not_indexed=True)
-@@ -1657,15 +1660,16 @@
-             if line.startswith("export "):
-                 k, eq, v = line[len("export ") :].partition("=")
-                 if eq == "=":
-                     append_env[k] = v
- 
-+        virtualenv_topobjdir = virtualenv_topobjdir or self.topobjdir
-         build_site = CommandSiteManager.from_environment(
-             self.topsrcdir,
-             lambda: get_state_dir(specific_to_topsrcdir=True, topsrcdir=self.topsrcdir),
-             "build",
--            os.path.join(self.topobjdir, "_virtualenvs"),
-+            os.path.join(virtualenv_topobjdir, "_virtualenvs"),
-         )
-         build_site.ensure()
- 
-         command = [build_site.python_path, os.path.join(self.topsrcdir, "configure.py")]
-         if options:
-