commit b66d7da8eb4989593792381a8f3ac40c1ad38fde Author: Georg Koppen <gk@torproject.org> Date: Thu Nov 9 07:58:42 2017 +0000 Bug 23231: Disable STL Wrappers for Win64 build for now Due to bug https://bugzilla.mozilla.org/show_bug.cgi?id=1392604 we disable STL wrappers for now. For some reason only 64bit Windows builds are affected. Thus we restrict the disabling only to them leaving all other targets unaffected. --- projects/firefox/STL_win64.patch | 24 ++++++++++++++++++++++++ projects/firefox/build | 4 ++++ projects/firefox/config | 2 ++ 3 files changed, 30 insertions(+) diff --git a/projects/firefox/STL_win64.patch b/projects/firefox/STL_win64.patch new file mode 100644 index 0000000..e528905 --- /dev/null +++ b/projects/firefox/STL_win64.patch @@ -0,0 +1,24 @@ +From 8f8c1a1069d4907d3cedae578975225d8caeecaf Mon Sep 17 00:00:00 2001 +From: Nicolas Vigier <boklm@torproject.org> +Date: Sat, 12 Aug 2017 22:00:13 +0200 +Subject: [PATCH] Bug 23231: disable STL Wrappers on Windows + +Workaround for: +https://bugzilla.mozilla.org/show_bug.cgi?id=1392604 +--- + old-configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/old-configure.in b/old-configure.in +index f5a2f05..e247551 100644 +--- a/old-configure.in ++++ b/old-configure.in +@@ -1338,7 +1338,7 @@ MOZ_CXX11 + AC_LANG_C + + case "${OS_TARGET}" in +-Darwin) ++WINNT|Darwin) + ;; + *) + STL_FLAGS="-I${DIST}/stl_wrappers" diff --git a/projects/firefox/build b/projects/firefox/build index f6a7654..13142e0 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -86,6 +86,10 @@ fi export CC='gcc -m32' [% END -%] +[% IF c("var/windows-x86_64") %] + patch -p1 < $rootdir/STL_win64.patch +[% END -%] + rm -f configure rm -f js/src/configure make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=[% c("var/torbrowser_version") %] --with-distribution-id=org.torproject --enable-update-channel=[% c("var/torbrowser_update_channel") %] --enable-bundled-fonts" diff --git a/projects/firefox/config b/projects/firefox/config index f508250..055fe57 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -93,3 +93,5 @@ input_files: - project: yasm name: yasm enable: '[% c("var/windows") %]' + - filename: STL_win64.patch + enable: '[% c("var/windows-x86_64") %]'