commit e1accd273fd41b6ede9a3690d1a7b5206a5edb5d Author: Georg Koppen gk@torproject.org Date: Fri May 15 07:07:42 2020 +0000

Bug 31128: Move Windows containers to Debian 10 --- projects/firefox/config | 5 ----- rbm.conf | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/projects/firefox/config b/projects/firefox/config index b6a8440..272634d 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -107,11 +107,6 @@ targets: # We need this to install wine32 dpkg --add-architecture i386 [% END -%] - echo 'deb http://ftp.debian.org/debian stretch-backports main' >> /etc/apt/sources.list - post_pkginst: | - # We need to have at least 3.0.3 which Mozilla is using in the - # mingw-w64/clang build process - apt-get -y -t stretch-backports install wine[% IF c("var/windows-i686") %]32[% END %] compiler: mingw-w64-clang

windows-i686: diff --git a/rbm.conf b/rbm.conf index 592c265..ba1cc23 100644 --- a/rbm.conf +++ b/rbm.conf @@ -350,7 +350,7 @@ targets: var: windows: 1 container: - suite: stretch + suite: buster arch: amd64 configure_opt: '--host=[% c("arch") %]-w64-mingw32 CFLAGS="[% c("var/CFLAGS") %]" LDFLAGS="[% c("var/LDFLAGS") %]" [% c("var/configure_opt_project") %]' CFLAGS: '-fstack-protector-strong -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security [% c("var/flag_mwindows") %]'