commit 4f71f0121be989e80a74cc7f0d476407bf7fc329 Author: Nicolas Vigier boklm@torproject.org Date: Fri Sep 8 12:10:25 2017 +0200

Bug 23229: build firefox for Windows 64 --- projects/firefox-langpacks/config | 3 +++ projects/firefox/config | 4 ++++ projects/firefox/mozconfig-windows-x86_64 | 29 +++++++++++++++++++++++++++++ projects/gcc/config | 2 +- 4 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index a645b92..4e42939 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -12,6 +12,9 @@ targets: windows-i686: var: ff_arch: win32 + windows-x86_64: + var: + ff_arch: win64 osx-x86_64: var: ff_arch: mac diff --git a/projects/firefox/config b/projects/firefox/config index 055fe57..24bb711 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -66,6 +66,10 @@ targets: var: martools_filename: mar-tools-win32.zip

+ windows-x86_64: + var: + martools_filename: mar-tools-win64.zip + input_files: - project: container-image - name: '[% c("var/compiler") %]' diff --git a/projects/firefox/mozconfig-windows-x86_64 b/projects/firefox/mozconfig-windows-x86_64 new file mode 100644 index 0000000..669c124 --- /dev/null +++ b/projects/firefox/mozconfig-windows-x86_64 @@ -0,0 +1,29 @@ +CROSS_COMPILE=1 + +ac_add_options --enable-application=browser +ac_add_options --target=x86_64-w64-mingw32 +ac_add_options --with-toolchain-prefix=x86_64-w64-mingw32- +ac_add_options --enable-default-toolkit=cairo-windows +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-mingw +mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" +mk_add_options MOZILLA_OFFICIAL=1 +mk_add_options BUILD_OFFICIAL=1 + +ac_add_options --disable-debug +ac_add_options --enable-optimize +ac_add_options --enable-strip +ac_add_options --enable-official-branding + +ac_add_options --enable-tor-browser-update +ac_add_options --enable-signmar +ac_add_options --enable-verify-mar + +# We can't build the sandbox code with mingw-w64: +# https://bugzilla.mozilla.org/show_bug.cgi?id=1042426 +ac_add_options --disable-sandbox +# Let's make sure no preference is enabling either Adobe's or Google's CDM. +ac_add_options --disable-eme +ac_add_options --disable-crashreporter +ac_add_options --disable-maintenance-service +ac_add_options --disable-webrtc +ac_add_options --disable-tests diff --git a/projects/gcc/config b/projects/gcc/config index de4ecc5..03241ef 100644 --- a/projects/gcc/config +++ b/projects/gcc/config @@ -37,7 +37,7 @@ var: popd

targets: - windows-i686: + windows: var: configure_opt: --disable-multilib --enable-languages=c,c++ arch_deps: