commit 3437f2a22e2480d19bf9fdbe92537505169d86ed Author: Georg Koppen gk@torproject.org Date: Thu Aug 27 19:33:29 2020 +0000

Bug 40062: Fix mach build bustage with 81.0bx branches

After https://bugzilla.mozilla.org/show_bug.cgi?id=1656993 landed we can either run `./mach create-mach-environment` or set `MACH_USE_SYSTEM_PYTHON` to fix build breakage caused by `mach`. We do the latter as the former fails in our no-network-scenario, too. --- projects/geckoview/build | 2 ++ projects/geckoview/config | 2 ++ 2 files changed, 4 insertions(+)

diff --git a/projects/geckoview/build b/projects/geckoview/build index 9eee8c4..b07bd2b 100644 --- a/projects/geckoview/build +++ b/projects/geckoview/build @@ -47,6 +47,8 @@ cp -r $gradle_repo/m2/* $gradle_repo rm -f configure rm -f js/src/configure

+# We unbreak mach, see: https://bugzilla.mozilla.org/show_bug.cgi?id=1656993. +export MACH_USE_SYSTEM_PYTHON=1 ./mach configure --with-tor-browser-version=[% c("var/torbrowser_version") %] ./mach build --verbose

diff --git a/projects/geckoview/config b/projects/geckoview/config index 0a8be4e..5478574 100644 --- a/projects/geckoview/config +++ b/projects/geckoview/config @@ -79,6 +79,8 @@ steps: mv $rootdir/[% c('input_files_by_name/gradle-dependencies') %] $gradle_repo cp -r $gradle_repo/m2/* $gradle_repo

+ # We unbreak mach, see: https://bugzilla.mozilla.org/show_bug.cgi?id=1656993. + export MACH_USE_SYSTEM_PYTHON=1 # We still need to specify --tor-browser-version due to bug 34005. ./mach configure --with-tor-browser-version=[% c("var/torbrowser_version") %] ./mach build --verbose