July 2020 - tbb-commits - lists.torproject.org

[tor-browser-build/master] Bug 32389: Enable WASM sandbox for Linux builds
by sysrqb＠torproject.org 17 Jul '20

17 Jul '20

commit b7d40046c0609e77cd9eb088f5e05775edd1c4a2 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jun 16 19:56:35 2020 +0000 Bug 32389: Enable WASM sandbox for Linux builds --- projects/firefox/build | 14 ++++++++++++++ projects/firefox/config | 6 ++++++ 2 files changed, 20 insertions(+) diff --git a/projects/firefox/build b/projects/firefox/build index 9461034..294e35a 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -39,6 +39,20 @@ export LLVM_CONFIG="/var/tmp/dist/clang/bin/llvm-config" [% END -%] [% END -%] +[% IF c("var/rlbox") -%] + tar -C /var/tmp/dist -xf [% c('input_files_by_name/wasi-sysroot') %] + # XXX: We need the libclang_rt.builtins-wasm32.a in our clang lib directory. + # Copy it over. + # https://searchfox.org/mozilla-central/source/build/build-clang/build-clang.…, + # include it directly in our clang + mkdir /var/tmp/dist/clang/lib/clang/[% pc("clang", "version") %]/lib/wasi + cp /var/tmp/dist/wasi-sysroot/lib/clang/9.0.0/lib/wasi/libclang_rt.builtins-wasm32.a /var/tmp/dist/clang/lib/clang/[% pc("clang", "version") %]/lib/wasi + tar -C /var/tmp/dist -xf [% c('input_files_by_name/lucetc') %] + export PATH="/var/tmp/dist/lucetc/bin:$PATH" + export WASM_SANDBOXED_LIBRARIES=graphite,ogg + export WASI_SYSROOT=/var/tmp/dist/wasi-sysroot/share/wasi-sysroot +[% END -%] + tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz [% IF c("var/osx") %] diff --git a/projects/firefox/config b/projects/firefox/config index 7c700a8..0ecce9d 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -135,6 +135,12 @@ input_files: name: rust - project: cbindgen name: cbindgen + - project: wasi-sysroot + name: wasi-sysroot + enable: '[% c("var/rlbox") %]' + - project: lucetc + name: lucetc + enable: '[% c("var/rlbox") %]' - project: node name: node - project: nasm

1 0

[tor-browser-build/master] Bug 40005: Adapt Node project for Firefox 78 ESR
by sysrqb＠torproject.org 17 Jul '20

17 Jul '20

commit 3410482e8620a030c2c8a998555b7b4b92118d76 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Jun 14 11:15:00 2020 +0000 Bug 40005: Adapt Node project for Firefox 78 ESR We remove our fenix-node project, too, as there is no difference between it and the node project anymore. It seems both ESR and non-ESR are using the same version for the time being. --- projects/fenix-node/build | 24 ------------------------ projects/fenix-node/config | 18 ------------------ projects/geckoview/build | 2 +- projects/geckoview/config | 6 +++--- projects/node/build | 4 ++-- projects/node/config | 5 +++-- 6 files changed, 9 insertions(+), 50 deletions(-) diff --git a/projects/fenix-node/build b/projects/fenix-node/build deleted file mode 100644 index 8cc8ea5..0000000 --- a/projects/fenix-node/build +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash -[% c("var/set_default_env") -%] -[% IF c("var/linux") %] - # We need a link to our GCC, otherwise the system cc gets used which points to - # /usr/bin/gcc. - [% pc('gcc', 'var/setup', { compiler_tarfile => c('input_files_by_name/gcc'), - hardened_gcc => 0 }) %] - ln -s gcc /var/tmp/dist/gcc/bin/cc - tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/binutils') %] - export PATH="/var/tmp/dist/binutils/bin:$PATH" -[% END -%] -distdir=/var/tmp/dist/[% project %] -tar -xf [% c('input_files_by_name/node') %] -cd node-[% c('version') %] - -./configure --prefix=$distdir -make -j[% c("buildconf/num_procs") %] -make install - -cd /var/tmp/dist -[% c('tar', { - tar_src => [ project ], - tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), - }) %] diff --git a/projects/fenix-node/config b/projects/fenix-node/config deleted file mode 100644 index b3534f4..0000000 --- a/projects/fenix-node/config +++ /dev/null @@ -1,18 +0,0 @@ -# vim: filetype=yaml sw=2 -version: v10.21.0 -filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' -var: - container: - use_container: 1 - -input_files: - - project: container-image - - project: binutils - name: binutils - enable: '[% c("var/linux") %]' - - project: '[% c("var/compiler") %]' - name: '[% c("var/compiler") %]' - enable: '[% c("var/linux") %]' - - URL: 'https://nodejs.org/download/release/[% c("version") %]/node-[% c("version") %].tar.xz' - sha256sum: 26b01fa28338cacaa8a66d7963ab2514e81678c268ab52ec55dcf937aadcb73b - name: node diff --git a/projects/geckoview/build b/projects/geckoview/build index b12c096..9eee8c4 100644 --- a/projects/geckoview/build +++ b/projects/geckoview/build @@ -20,7 +20,7 @@ tar -C /var/tmp/dist -xf [% c('input_files_by_name/node') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/clang') %] export LLVM_CONFIG="/var/tmp/dist/clang/bin/llvm-config" tar -C /var/tmp/dist -xf [% c('input_files_by_name/binutils') %] -export PATH="/var/tmp/dist/fenix-rust/bin:/var/tmp/dist/fenix-cbindgen:/var/tmp/dist/nasm/bin:/var/tmp/dist/python/bin:/var/tmp/dist/fenix-node/bin:/var/tmp/dist/fenix-clang/bin:/var/tmp/dist/binutils/bin:$PATH" +export PATH="/var/tmp/dist/fenix-rust/bin:/var/tmp/dist/fenix-cbindgen:/var/tmp/dist/nasm/bin:/var/tmp/dist/python/bin:/var/tmp/dist/node/bin:/var/tmp/dist/fenix-clang/bin:/var/tmp/dist/binutils/bin:$PATH" tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz diff --git a/projects/geckoview/config b/projects/geckoview/config index e82139a..c046660 100644 --- a/projects/geckoview/config +++ b/projects/geckoview/config @@ -47,7 +47,7 @@ steps: tar -C $distdir -xf [% c('input_files_by_name/node') %] tar -C $distdir -xf [% c('input_files_by_name/python') %] - export PATH="/var/tmp/dist/fenix-node/bin:/var/tmp/dist/python/bin:$PATH" + export PATH="/var/tmp/dist/node/bin:/var/tmp/dist/python/bin:$PATH" tar -C $builddir -xf [% c('input_files_by_name/geckoview_armv7') %] tar -C $builddir -xf [% c('input_files_by_name/geckoview_aarch64') %] @@ -97,7 +97,7 @@ steps: - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' pkg_type: build - - project: fenix-node + - project: node name: node pkg_type: build - project: python @@ -147,7 +147,7 @@ input_files: name: rust - project: fenix-cbindgen name: cbindgen - - project: fenix-node + - project: node name: node - project: nasm name: nasm diff --git a/projects/node/build b/projects/node/build index 0e6ca04..8cc8ea5 100644 --- a/projects/node/build +++ b/projects/node/build @@ -10,8 +10,8 @@ export PATH="/var/tmp/dist/binutils/bin:$PATH" [% END -%] distdir=/var/tmp/dist/[% project %] -tar -xf [% project %]-[% c('version') %].tar.xz -cd [% project %]-[% c('version') %] +tar -xf [% c('input_files_by_name/node') %] +cd node-[% c('version') %] ./configure --prefix=$distdir make -j[% c("buildconf/num_procs") %] diff --git a/projects/node/config b/projects/node/config index e023380..b3534f4 100644 --- a/projects/node/config +++ b/projects/node/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: v10.16.0 +version: v10.21.0 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: container: @@ -14,4 +14,5 @@ input_files: name: '[% c("var/compiler") %]' enable: '[% c("var/linux") %]' - URL: 'https://nodejs.org/download/release/[% c("version") %]/node-[% c("version") %].tar.xz' - sha256sum: 18e37f891d10ea7fbc8f6410c444c2b1d9cc3cbbb1d35aa9c41f761816956608 + sha256sum: 26b01fa28338cacaa8a66d7963ab2514e81678c268ab52ec55dcf937aadcb73b + name: node

1 0

[tor-browser-build/master] Bug 40018: Add libtapi project for cctools
by sysrqb＠torproject.org 17 Jul '20

17 Jul '20

commit 58d6189af6914b00264bf556ef61b8c53ff5f2f1 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jul 9 15:09:07 2020 +0000 Bug 40018: Add libtapi project for cctools --- projects/libtapi/build | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ projects/libtapi/config | 20 ++++++++++++++++++++ 2 files changed, 68 insertions(+) diff --git a/projects/libtapi/build b/projects/libtapi/build new file mode 100644 index 0000000..a0d9c3e --- /dev/null +++ b/projects/libtapi/build @@ -0,0 +1,48 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +builddir=/var/tmp/build/[% project %]-[% c('version') %] +distdir=/var/tmp/dist/[% project %] +mkdir -p /var/tmp/dist +tar -C /var/tmp/dist -xf [% c('input_files_by_name/clang') %] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/cmake') %] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/ninja') %] + +# We don't export the path to clang here to follow Mozilla's build script at +# taskcluster/scripts/misc/build-cctools-port.sh more closely. +export PATH="/var/tmp/dist/cmake/bin:/var/tmp/dist/ninja:$PATH" +export CLANG_DIR=/var/tmp/dist/clang +mkdir -p /var/tmp/build +tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz +export CC=$CLANG_DIR/bin/clang +export CXX=$CLANG_DIR/bin/clang++ +# We also need this LD_LIBRARY_PATH at build time, since tapi builds bits of +# clang build tools, and then executes those tools. +export LD_LIBRARY_PATH=$CLANG_DIR/lib + +cd $builddir +mkdir build +cd build +# Values taken from build.sh +TAPI_REPOSITORY=tapi-1000.10.8 +TAPI_VERSION=10.0.0 + +INCLUDE_FIX="-I $builddir/src/llvm/projects/clang/include -I $PWD/projects/clang/include" + +cmake $builddir/src/llvm \ + -GNinja \ + -DCMAKE_CXX_FLAGS="$INCLUDE_FIX" \ + -DLLVM_INCLUDE_TESTS=OFF \ + -DCMAKE_BUILD_TYPE=RELEASE \ + -DCMAKE_INSTALL_PREFIX=$distdir \ + -DLLVM_TARGETS_TO_BUILD="X86;ARM;AArch64" \ + -DTAPI_REPOSITORY_STRING=$TAPI_REPOSITORY \ + -DTAPI_FULL_VERSION=$TAPI_VERSION + +ninja clangBasic +ninja libtapi install-libtapi install-tapi-headers + +cd /var/tmp/dist +[% c('tar', { + tar_src => [ project ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/libtapi/config b/projects/libtapi/config new file mode 100644 index 0000000..6c4f5d0 --- /dev/null +++ b/projects/libtapi/config @@ -0,0 +1,20 @@ +# vim: filetype=yaml sw=2 +filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' +version: '[% c("abbrev") %]' +# This can be found in +# taskcluster/ci/fetch/toolchains.yml +git_hash: 3efb201881e7a76a21e0554906cf306432539cef +git_url: https://github.com/tpoechtrager/apple-libtapi + +var: + container: + use_container: 1 + +input_files: + - project: container-image + - name: clang + project: clang + - name: cmake + project: cmake + - name: ninja + project: ninja

1 0

[tor-browser-build/master] Bug 34230: Update Windows toolchain for Firefox 78 ESR
by sysrqb＠torproject.org 17 Jul '20

17 Jul '20

commit e26758540bb98e8dc3f9b94e06acd0b75f1a4aa8 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jun 30 07:09:10 2020 +0000 Bug 34230: Update Windows toolchain for Firefox 78 ESR The sort patch is not needed anymore as the reproducibility issue got fixed with commit 1405ac457b8b583215cf92d73fbe4479f7c86029 in libcxx. --enable-strip is gone for Windows, see: https://hg.mozilla.org/mozilla-central/rev/943fe6210744. We rebase the libunwind related patch for 32bit Windows for compatibility with Rust 1.41.1, too. --- projects/firefox/mozconfig-windows-i686 | 1 - projects/firefox/mozconfig-windows-x86_64 | 1 - projects/firefox/nsis-uninstall.patch | 18 +++---- projects/llvm-mingw/config | 2 +- projects/mingw-w64-clang/build | 1 - projects/mingw-w64-clang/config | 5 +- projects/mingw-w64-clang/sort.patch | 22 -------- projects/mingw-w64/config | 6 +-- projects/rust/unwind.patch | 85 ++++++++++++++++--------------- 9 files changed, 56 insertions(+), 85 deletions(-) diff --git a/projects/firefox/mozconfig-windows-i686 b/projects/firefox/mozconfig-windows-i686 index 8cb2850..a2364e9 100644 --- a/projects/firefox/mozconfig-windows-i686 +++ b/projects/firefox/mozconfig-windows-i686 @@ -23,7 +23,6 @@ export MOZILLA_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 diff --git a/projects/firefox/mozconfig-windows-x86_64 b/projects/firefox/mozconfig-windows-x86_64 index d35dc18..188b3c5 100644 --- a/projects/firefox/mozconfig-windows-x86_64 +++ b/projects/firefox/mozconfig-windows-x86_64 @@ -23,7 +23,6 @@ export MOZILLA_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 diff --git a/projects/firefox/nsis-uninstall.patch b/projects/firefox/nsis-uninstall.patch index 60e4e3d..93d56aa 100644 --- a/projects/firefox/nsis-uninstall.patch +++ b/projects/firefox/nsis-uninstall.patch @@ -1,13 +1,9 @@ -From e338a77c64c0afb72e857c7daa63346d35ad3891 Mon Sep 17 00:00:00 2001 +From 67c1d7d66d99494102832e12059a84fa439c88e0 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Tue, 12 Jun 2018 21:58:24 -0400 -Subject: [PATCH 1/1] Bug 26205: Don't build the uninstaller for Windows during +Subject: [PATCH] Bug 26205: Don't build the uninstaller for Windows during Firefox compilation ---- - browser/Makefile.in | 4 ---- - browser/installer/Makefile.in | 4 ---- - 2 files changed, 8 deletions(-) diff --git a/browser/Makefile.in b/browser/Makefile.in index 2eb9e708f68e..0c9442183942 100644 @@ -25,7 +21,7 @@ index 2eb9e708f68e..0c9442183942 100644 $(MAKE) -C installer/windows maintenanceservice_installer endif diff --git a/browser/installer/Makefile.in b/browser/installer/Makefile.in -index 1bf11252ee06..dee6d5434106 100644 +index 0325f0ffab9a..a5a9488623a3 100644 --- a/browser/installer/Makefile.in +++ b/browser/installer/Makefile.in @@ -98,10 +98,6 @@ ifdef NECKO_WIFI @@ -36,9 +32,9 @@ index 1bf11252ee06..dee6d5434106 100644 -DEFINES += -DHAVE_MAKENSISU=1 -endif - - ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) - MOZ_PKG_MAC_DSSTORE=$(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/dsstore - MOZ_PKG_MAC_BACKGROUND=$(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/background.png + ifdef MOZ_DEFAULT_BROWSER_AGENT + DEFINES += -DMOZ_DEFAULT_BROWSER_AGENT=1 + endif -- -2.18.0.rc2 +2.27.0 diff --git a/projects/llvm-mingw/config b/projects/llvm-mingw/config index b1ebf42..eaaed6e 100644 --- a/projects/llvm-mingw/config +++ b/projects/llvm-mingw/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' -git_hash: c3a16814bd26aa6702e1e5b482a3d9044bb0f725 +git_hash: 9f8e5cebd6dbbb7546e8917e6c59284699a48d26 git_url: https://github.com/mstorsjo/llvm-mingw.git filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' diff --git a/projects/mingw-w64-clang/build b/projects/mingw-w64-clang/build index 302975d..ecb0e2c 100644 --- a/projects/mingw-w64-clang/build +++ b/projects/mingw-w64-clang/build @@ -172,7 +172,6 @@ make -j[% c("buildconf/num_procs") %] VERBOSE=1 # libcxx cd $builddir/libcxx -patch -p1 < $rootdir/sort.patch mkdir build && cd build cmake -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$distdir/[% c("arch") %]-w64-mingw32 \ diff --git a/projects/mingw-w64-clang/config b/projects/mingw-w64-clang/config index 11480b9..9ae0e61 100644 --- a/projects/mingw-w64-clang/config +++ b/projects/mingw-w64-clang/config @@ -1,9 +1,9 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' git_url: https://git.code.sf.net/p/mingw-w64/mingw-w64 -git_hash: 0a1d495478d8ed1a94fc77b9dbb428b7e0372588 +git_hash: 1b373beec6d07478ffba33726bb3bb21f32e4411 version: '[% c("abbrev") %]' -llvm_version: 8.0.1 +llvm_version: 9.0.1 gpg_keyring: clang.gpg sig_ext: sig @@ -36,4 +36,3 @@ input_files: - project: llvm-mingw name: llvm-mingw - filename: mingw-winrt.patch - - filename: sort.patch diff --git a/projects/mingw-w64-clang/sort.patch b/projects/mingw-w64-clang/sort.patch deleted file mode 100644 index e9143b0..0000000 --- a/projects/mingw-w64-clang/sort.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 9eeb3b9ea13b25591c9081a5f05a1904d367d523 Mon Sep 17 00:00:00 2001 -From: Georg Koppen <gk(a)torproject.org> -Date: Wed, 11 Sep 2019 13:25:54 +0000 -Subject: [PATCH] sorted - - -diff --git a/utils/merge_archives.py b/utils/merge_archives.py -index 58d92f0e2..597ca2471 100755 ---- a/utils/merge_archives.py -+++ b/utils/merge_archives.py -@@ -124,7 +124,7 @@ def main(): - execute_command_verbose([ar_exe, 'x', arc], cwd=temp_directory_root, - verbose=args.verbose) - -- files = glob.glob(os.path.join(temp_directory_root, '*.o*')) -+ files = sorted(glob.glob(os.path.join(temp_directory_root, '*.o*'))) - if not files: - print_and_exit('Failed to glob for %s' % temp_directory_root) - cmd = [ar_exe, 'qcs', args.output] + files --- -2.23.0 - diff --git a/projects/mingw-w64/config b/projects/mingw-w64/config index 1ccbcdf..b0ace13 100644 --- a/projects/mingw-w64/config +++ b/projects/mingw-w64/config @@ -1,12 +1,12 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' git_url: https://git.code.sf.net/p/mingw-w64/mingw-w64 -git_hash: 0a1d495478d8ed1a94fc77b9dbb428b7e0372588 +git_hash: 1b373beec6d07478ffba33726bb3bb21f32e4411 version: '[% c("abbrev") %]' var: container: use_container: 1 - gcc_version: 9.2.0 + gcc_version: 9.3.0 deps: - automake - build-essential @@ -30,6 +30,6 @@ targets: input_files: - project: container-image - URL: 'https://ftp.gnu.org/gnu/gcc/gcc-[% c("var/gcc_version") %]/gcc-[% c("var/gcc_version") %].tar.xz' - sha256sum: ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206 + sha256sum: 71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1 - name: binutils project: binutils diff --git a/projects/rust/unwind.patch b/projects/rust/unwind.patch index 7b22dcb..c25d9d2 100644 --- a/projects/rust/unwind.patch +++ b/projects/rust/unwind.patch @@ -1,4 +1,4 @@ -From b3bea7008ece7a5bdf9b5a5dcc95e82febad1854 Mon Sep 17 00:00:00 2001 +From 212ea02a0743a3bd4fcab1288682d3d780da960b Mon Sep 17 00:00:00 2001 From: Bjorn Neergaard <bjorn(a)neersighted.com> Date: Sat, 9 Feb 2019 19:39:23 +0000 Subject: [PATCH] Fix cross-compiling i686-pc-windows-gnu from Linux @@ -32,61 +32,58 @@ rethinking of how iOS is special-cased above, to avoid further duplication. Input on how to best structure this file is requested. diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs -index 249a183189..df08d6eb0c 100644 +index 831053bc0f7..13ec5da3e3d 100644 --- a/src/bootstrap/compile.rs +++ b/src/bootstrap/compile.rs -@@ -162,7 +162,12 @@ pub fn std_cargo(builder: &Builder<'_>, - .arg("--features") - .arg("compiler-builtins-mem"); - } else { -- let features = builder.std_features(); -+ let mut features = builder.std_features(); -+ +@@ -208,6 +208,11 @@ pub fn std_cargo(builder: &Builder<'_>, + let mut features = builder.std_features(); + features.push_str(&compiler_builtins_c_feature); + + // FIXME: Temporary detection of SJLJ MinGW compilers. + if builder.config.build.contains("linux") && target == "i686-pc-windows-gnu" { + features.push_str(" sjlj_eh"); + } - ++ if compiler.stage != 0 && builder.config.sanitizers { // This variable is used by the sanitizer runtime crates, e.g. + // rustc_lsan, to build the sanitizer runtime from C code diff --git a/src/libstd/Cargo.toml b/src/libstd/Cargo.toml -index 7d60a17042..d876d0b89a 100644 +index a22e162bbff..e1c8f164916 100644 --- a/src/libstd/Cargo.toml +++ b/src/libstd/Cargo.toml -@@ -71,3 +71,4 @@ wasm-bindgen-threads = [] - # https://github.com/rust-lang-nursery/stdsimd/blob/master/crates/std_detect/… +@@ -78,6 +78,7 @@ panic_immediate_abort = ["core/panic_immediate_abort"] + # https://github.com/rust-lang/stdarch/blob/master/crates/std_detect/Cargo.to… std_detect_file_io = [] std_detect_dlsym_getauxval = [] +sjlj_eh = ["unwind/sjlj_eh"] + + [package.metadata.fortanix-sgx] + # Maximum possible number of threads when testing +diff --git a/src/libtest/Cargo.toml b/src/libtest/Cargo.toml +index 170fbb984cf..b1b0be71067 100644 +--- a/src/libtest/Cargo.toml ++++ b/src/libtest/Cargo.toml +@@ -29,3 +29,4 @@ llvm-libunwind = ["std/llvm-libunwind"] + panic-unwind = ["std/panic_unwind"] + panic_immediate_abort = ["std/panic_immediate_abort"] + profiler = ["std/profiler"] ++sjlj_eh = ["std/sjlj_eh"] diff --git a/src/libunwind/Cargo.toml b/src/libunwind/Cargo.toml -index 2378b0a315..0b5979ed62 100644 +index 77bcfffd506..9d9fc5fbff5 100644 --- a/src/libunwind/Cargo.toml +++ b/src/libunwind/Cargo.toml -@@ -16,3 +16,6 @@ doc = false - core = { path = "../libcore" } - libc = { version = "0.2.43", features = ['rustc-dep-of-std'], default-features = false } - compiler_builtins = "0.1.0" -+ -+[features] +@@ -26,3 +26,4 @@ cc = { version = "1.0.1" } + + [features] + llvm-libunwind = [] +sjlj_eh = [] diff --git a/src/libunwind/libunwind.rs b/src/libunwind/libunwind.rs -index 339b554ed6..ec2f93ed60 100644 +index 0b39503c0d0..ec8681c2985 100644 --- a/src/libunwind/libunwind.rs +++ b/src/libunwind/libunwind.rs -@@ -1,10 +1,5 @@ - #![allow(nonstandard_style)] - --macro_rules! cfg_if { -- ( $( if #[cfg( $meta:meta )] { $($it1:item)* } else { $($it2:item)* } )* ) => -- ( $( $( #[cfg($meta)] $it1)* $( #[cfg(not($meta))] $it2)* )* ) --} -- - use libc::{c_int, c_void, uintptr_t}; - - #[repr(C)] -@@ -73,8 +68,8 @@ pub enum _Unwind_Context {} - pub type _Unwind_Exception_Cleanup_Fn = extern "C" fn(unwind_code: _Unwind_Reason_Code, - exception: *mut _Unwind_Exception); +@@ -74,8 +74,8 @@ pub type _Unwind_Exception_Cleanup_Fn = extern "C" fn(unwind_code: _Unwind_Reaso + any(target_os = "fuchsia", target_os = "linux")), + link(name = "unwind", kind = "static"))] extern "C" { - #[unwind(allowed)] - pub fn _Unwind_Resume(exception: *mut _Unwind_Exception) -> !; @@ -95,15 +92,15 @@ index 339b554ed6..ec2f93ed60 100644 pub fn _Unwind_DeleteException(exception: *mut _Unwind_Exception); pub fn _Unwind_GetLanguageSpecificData(ctx: *mut _Unwind_Context) -> *mut c_void; pub fn _Unwind_GetRegionStart(ctx: *mut _Unwind_Context) -> _Unwind_Ptr; -@@ -206,26 +201,52 @@ if #[cfg(all(any(target_os = "ios", target_os = "netbsd", not(target_arch = "arm - pc - } - } -+} // cfg_if! +@@ -216,32 +216,50 @@ if #[cfg(all(any(target_os = "ios", target_os = "netbsd", not(target_arch = "arm + } // cfg_if! + cfg_if::cfg_if! { -if #[cfg(not(all(target_os = "ios", target_arch = "arm")))] { - // Not 32-bit iOS -+cfg_if! { +- #[cfg_attr(all(feature = "llvm-libunwind", +- any(target_os = "fuchsia", target_os = "linux")), +- link(name = "unwind", kind = "static"))] +if #[cfg(all(target_os = "ios", target_arch = "arm"))] { + // 32-bit iOS uses SjLj and does not provide _Unwind_Backtrace() extern "C" { @@ -132,6 +129,9 @@ index 339b554ed6..ec2f93ed60 100644 } -} else { - // 32-bit iOS uses SjLj and does not provide _Unwind_Backtrace() +- #[cfg_attr(all(feature = "llvm-libunwind", +- any(target_os = "fuchsia", target_os = "linux")), +- link(name = "unwind", kind = "static"))] - extern "C" { - #[unwind(allowed)] - pub fn _Unwind_SjLj_RaiseException(e: *mut _Unwind_Exception) -> _Unwind_Reason_Code; @@ -157,6 +157,7 @@ index 339b554ed6..ec2f93ed60 100644 + } } } // cfg_if! + -- -2.23.0.rc0 +2.27.0

1 0

[tor-browser-build/master] Bug 40015: Use only 64bit fxc2
by sysrqb＠torproject.org 17 Jul '20

17 Jul '20

commit bdd3275ec4291c66a7f28f2d8c772a59180109e7 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Jul 5 06:37:59 2020 +0000 Bug 40015: Use only 64bit fxc2 We use the somewhat surprising breakage due to https://bugzilla.mozilla.org/show_bug.cgi?id=1619504 to clean up our fxc2 build and usage. Previously, we built both the 64bit and 32bit version of fxc2 and were running them in a 64bit and 32bit Wine environment, respectively. However, that's not needed because a) Wine is capable of running both 64bit and 32bit binaries and b) fxc2 is only used at build time to generate shader files. As we are building both Windows flavors in a 64bit container we should easily be able to live with just a 64bit variant. We need, nevertheless, take care that we still bundle the correct d3dcompiler_47.dll library for the respective architecture. --- projects/firefox/build | 12 +++++------- projects/firefox/config | 7 ++----- projects/fxc2/build | 13 +++---------- projects/fxc2/config | 2 +- rbm.conf | 2 ++ 5 files changed, 13 insertions(+), 23 deletions(-) diff --git a/projects/firefox/build b/projects/firefox/build index 294e35a..79278c8 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -9,12 +9,6 @@ mkdir -p [% dest_dir _ '/' _ c('filename') %] # Setting up fxc2 tar -C /var/tmp/dist -xf [% c('input_files_by_name/fxc2') %] export PATH="/var/tmp/dist/fxc2/bin:$PATH" - # fxc2 requires Wine. - export WINEARCH=[% IF c("var/windows-x86_64") %]win64[% ELSE %]win32[% END %] - export HOME=/var/tmp/home - mkdir -p $HOME - WINEROOT=$HOME/.wine/drive_c - wine wineboot -i # Setting up stack protector support tar -C /var/tmp/dist -xf [% c('input_files_by_name/mingw-w64') %] cp /var/tmp/dist/mingw-w64/gcclibs/{libssp.a,libssp_nonshared.a} /var/tmp/dist/mingw-w64-clang/[% c("arch") %]-w64-mingw32/lib/ @@ -192,7 +186,11 @@ rm -f js/src/configure [% IF c("var/windows") %] cp -a obj-*/dist/firefox/* $distdir/Browser/ - cp -a /var/tmp/dist/fxc2/bin/d3dcompiler_47.dll $distdir/Browser + [% IF c("var/windows-i686") %] + cp -a /var/tmp/dist/fxc2/bin/d3dcompiler_47_32.dll $distdir/Browser/d3dcompiler_47.dll + [% ELSE %] + cp -a /var/tmp/dist/fxc2/bin/d3dcompiler_47.dll $distdir/Browser + [% END %] [% END %] # Make MAR-based update tools available for use during the bundle phase. diff --git a/projects/firefox/config b/projects/firefox/config index 0ecce9d..2cc734b 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -102,11 +102,6 @@ targets: var: arch_deps: - wine - pre_pkginst: | - [% IF c("var/windows-i686") -%] - # We need this to install wine32 - dpkg --add-architecture i386 - [% END -%] compiler: mingw-w64-clang windows-i686: @@ -152,6 +147,8 @@ input_files: - project: fxc2 name: fxc2 enable: '[% c("var/windows") %]' + target_prepend: + - torbrowser-windows-x86_64 - name: mingw-w64 project: mingw-w64 enable: '[% c("var/windows") %]' diff --git a/projects/fxc2/build b/projects/fxc2/build index 46a7db8..26379f9 100644 --- a/projects/fxc2/build +++ b/projects/fxc2/build @@ -8,19 +8,12 @@ mkdir -p /var/tmp/build tar -C /var/tmp/build -xf [% project %]-[% c("version") %].tar.gz cd /var/tmp/build/[% project %]-[% c("version") %] -[% IF c("var/windows-i686") -%] - make x86 -[% ELSE -%] - make x64 -[% END -%] +make x64 mkdir -p $distdir/bin/ cp fxc2.exe $distdir/bin/ -[% IF c("var/windows-i686") -%] - cp dll/d3dcompiler_47_32.dll $distdir/bin/d3dcompiler_47.dll -[% ELSE -%] - cp dll/d3dcompiler_47.dll $distdir/bin/ -[% END -%] +cp dll/d3dcompiler_47_32.dll $distdir/bin/d3dcompiler_47_32.dll +cp dll/d3dcompiler_47.dll $distdir/bin/ cd /var/tmp/dist diff --git a/projects/fxc2/config b/projects/fxc2/config index 4b9f151..d1620d9 100644 --- a/projects/fxc2/config +++ b/projects/fxc2/config @@ -2,7 +2,7 @@ version: '[% c("abbrev") %]' git_url: https://github.com/mozilla/fxc2.git git_hash: 5ace4c25b63cb5a83b58a3eae3d36256a6022cde -filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: container: diff --git a/rbm.conf b/rbm.conf index e1376ac..a3850d9 100644 --- a/rbm.conf +++ b/rbm.conf @@ -394,6 +394,7 @@ targets: arch: x86_64 var: windows-x86_64: 1 + windows-i686: 0 osname: windows-x86_64 # HEASLR is 64 bit only (see bug 12968) flag_HEASLR: '-Wl,--high-entropy-va' @@ -401,6 +402,7 @@ targets: arch: i686 var: windows-i686: 1 + windows-x86_64: 0 osname: windows-i686 windows: var:

1 0

[tor-browser-build/master] Bug 40003: Update cctools version for Firefox 78 ESR
by sysrqb＠torproject.org 17 Jul '20

17 Jul '20

commit 91375fb80f86bf849aee8bf5a76bb8ceee7c6180 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jul 9 19:48:49 2020 +0000 Bug 40003: Update cctools version for Firefox 78 ESR --- projects/cctools/build | 27 +++++++++++++++++++++------ projects/cctools/config | 6 ++++-- 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/projects/cctools/build b/projects/cctools/build index a724399..b8d7523 100644 --- a/projects/cctools/build +++ b/projects/cctools/build @@ -1,20 +1,35 @@ #!/bin/bash [% c("var/set_default_env") -%] distdir=/var/tmp/dist/[% project %] -mkdir -p /var/tmp/dist +mkdir -p $distdir tar -C /var/tmp/dist -xf [% c('input_files_by_name/clang') %] -export PATH="/var/tmp/dist/clang/bin:$PATH" +tar -C /var/tmp/dist -xf [% c('input_files_by_name/libtapi') %] +mv /var/tmp/dist/libtapi/* $distdir +export CLANG_DIR=/var/tmp/dist/clang mkdir -p /var/tmp/build tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %]/cctools -export CC=clang -export CXX=clang++ +export CC=$CLANG_DIR/bin/clang +export CXX=$CLANG_DIR/bin/clang++ +export LDFLAGS="-lpthread -Wl,-rpath-link,$CLANG_DIR/lib -Wl,-rpath,\\\$\$ORIGIN/../lib,-rpath,\\\$\$ORIGIN/../../clang/lib" +# Force re-libtoolization to overwrite files with the new libtool bits. +perl -pi -e 's/(LIBTOOLIZE -c)/\1 -f/' autogen.sh ./autogen.sh -./configure --prefix=$distdir --target=x86_64-apple-darwin11 --with-llvm-config=llvm-config -export LDFLAGS=-lpthread +./configure \ + --prefix=$distdir \ + --target=x86_64-apple-darwin \ + --with-llvm-config=$CLANG_DIR/bin/llvm-config \ + --enable-lto-support \ + --enable-tapi-support \ + --with-libtapi=$distdir make -j[% c("buildconf/num_procs") %] install +strip $distdir/bin/* +# cctools doesn't include dsymutil but clang will need to find it. +cp $CLANG_DIR/bin/dsymutil $distdir/bin/x86_64-apple-darwin-dsymutil +# various build scripts based on cmake want to find `lipo` without a prefix +cp $distdir/bin/x86_64-apple-darwin-lipo $distdir/bin/lipo cd /var/tmp/dist [% c('tar', { diff --git a/projects/cctools/config b/projects/cctools/config index 8e7ff65..280e692 100644 --- a/projects/cctools/config +++ b/projects/cctools/config @@ -2,8 +2,8 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' version: '[% c("abbrev") %]' # This can be found in -# browser/config/tooltool-manifest/macosx64/clang.manifest -git_hash: 8e9c3f2506b51cf56725eaa60b6e90e240e249ca +# taskcluster/ci/fetch/toolchains.yml +git_hash: f2890afb8a52944dd8265e489a0691c7b0afdd54 git_url: https://github.com/tpoechtrager/cctools-port var: @@ -14,3 +14,5 @@ input_files: - project: container-image - name: clang project: clang + - name: libtapi + project: libtapi

1 0

[tor-browser-build/master] Bug 33410: Enable RLBox for macOS
by sysrqb＠torproject.org 17 Jul '20

17 Jul '20

commit 9406dd02daf79c6f6dbfe2f164aec245075a46d4 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Jun 20 10:56:12 2020 +0000 Bug 33410: Enable RLBox for macOS --- projects/firefox/build | 8 ++++++-- projects/lucetc/build | 14 +++++++++++--- projects/lucetc/config | 10 ++++++---- projects/wasi-sysroot/build | 16 +++++++++------- projects/wasi-sysroot/config | 6 ++++-- rbm.conf | 2 ++ 6 files changed, 38 insertions(+), 18 deletions(-) diff --git a/projects/firefox/build b/projects/firefox/build index 79278c8..a9f86bf 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -39,8 +39,12 @@ export LLVM_CONFIG="/var/tmp/dist/clang/bin/llvm-config" # Copy it over. # https://searchfox.org/mozilla-central/source/build/build-clang/build-clang.…, # include it directly in our clang - mkdir /var/tmp/dist/clang/lib/clang/[% pc("clang", "version") %]/lib/wasi - cp /var/tmp/dist/wasi-sysroot/lib/clang/9.0.0/lib/wasi/libclang_rt.builtins-wasm32.a /var/tmp/dist/clang/lib/clang/[% pc("clang", "version") %]/lib/wasi + rtdir=/var/tmp/dist/clang/lib/clang/[% pc("clang", "version") %]/lib/wasi + [% IF c("var/osx") -%] + rtdir=/var/tmp/dist/macosx-toolchain/clang/lib/clang/[% pc("clang", "version") %]/lib/wasi + [% END-%] + mkdir -p $rtdir + cp /var/tmp/dist/wasi-sysroot/lib/clang/9.0.0/lib/wasi/libclang_rt.builtins-wasm32.a $rtdir tar -C /var/tmp/dist -xf [% c('input_files_by_name/lucetc') %] export PATH="/var/tmp/dist/lucetc/bin:$PATH" export WASM_SANDBOXED_LIBRARIES=graphite,ogg diff --git a/projects/lucetc/build b/projects/lucetc/build index 3f835bd..208f4e1 100644 --- a/projects/lucetc/build +++ b/projects/lucetc/build @@ -1,16 +1,24 @@ #!/bin/bash [% c("var/set_default_env") -%] -[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] +# XXX: Do we need the GCC part here if we set CC to clang anyway? +[% IF c("var/linux") %] + # We need a link to our GCC, otherwise the system cc gets used which points to + # /usr/bin/gcc. + [% pc('gcc', 'var/setup', { compiler_tarfile => c('input_files_by_name/gcc'), + hardened_gcc => 0 }) %] + ln -s gcc /var/tmp/dist/gcc/bin/cc + tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/binutils') %] + export PATH="/var/tmp/dist/binutils/bin:$PATH" +[% END -%] distdir=/var/tmp/dist builddir=/var/tmp/build/[% project %] mkdir -p $distdir tar -C /var/tmp/dist -xf [% c('input_files_by_name/cmake') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/clang') %] -tar -C /var/tmp/dist -xf [% c('input_files_by_name/binutils') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/rust') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/wasi-sysroot') %] -export PATH="/var/tmp/dist/cmake/bin:/var/tmp/dist/clang/bin:/var/tmp/dist/binutils/bin:/var/tmp/dist/rust/bin:$PATH" +export PATH="/var/tmp/dist/cmake/bin:/var/tmp/dist/clang/bin:/var/tmp/dist/rust/bin:$PATH" export CC=$distdir/clang/bin/clang export CFLAGS="-L$distdir/clang/lib" export CXX=$distdir/clang/bin/clang++ diff --git a/projects/lucetc/config b/projects/lucetc/config index f60629e..72b79fe 100644 --- a/projects/lucetc/config +++ b/projects/lucetc/config @@ -11,16 +11,18 @@ var: input_files: - project: container-image + - name: binutils + project: binutils + enable: '[% c("var/linux") %]' # Our clang still needs GCC parts (libstdc++ for instance) so we include that # one here even though compilation gets done solely by clang. - - name: '[% c("var/compiler") %]' - project: '[% c("var/compiler") %]' + - project: '[% c("var/compiler") %]' + name: '[% c("var/compiler") %]' + enable: '[% c("var/linux") %]' - name: cmake project: cmake - name: clang project: clang - - name: binutils - project: binutils - name: rust project: rust - name: wasi-sysroot diff --git a/projects/wasi-sysroot/build b/projects/wasi-sysroot/build index 6cdcf2f..e66d1e0 100644 --- a/projects/wasi-sysroot/build +++ b/projects/wasi-sysroot/build @@ -1,15 +1,17 @@ #!/bin/bash [% c("var/set_default_env") -%] -# We need a link to our GCC, otherwise the system cc gets used which points to -# /usr/bin/gcc. -[% pc('gcc', 'var/setup', { compiler_tarfile => c('input_files_by_name/gcc'), - hardened_gcc => 0 }) %] -ln -s gcc /var/tmp/dist/gcc/bin/cc - +[% IF c("var/linux") %] + # We need a link to our GCC, otherwise the system cc gets used which points to + # /usr/bin/gcc. + [% pc('gcc', 'var/setup', { compiler_tarfile => c('input_files_by_name/gcc'), + hardened_gcc => 0 }) %] + ln -s gcc /var/tmp/dist/gcc/bin/cc + tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/binutils') %] + export PATH="/var/tmp/dist/binutils/bin:$PATH" +[% END -%] distdir=/var/tmp/dist builddir=/var/tmp/build/[% project %] mkdir -p $distdir -tar -C /var/tmp/dist -xf [% c('input_files_by_name/binutils') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/cmake') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/ninja') %] export PATH=/var/tmp/dist/binutils/bin:/var/tmp/dist/cmake/bin:/var/tmp/dist/ninja:$PATH diff --git a/projects/wasi-sysroot/config b/projects/wasi-sysroot/config index 8b3ae15..c4ded87 100644 --- a/projects/wasi-sysroot/config +++ b/projects/wasi-sysroot/config @@ -17,10 +17,12 @@ targets: input_files: - project: container-image - - name: gcc - project: gcc - name: binutils project: binutils + enable: '[% c("var/linux") %]' + - project: '[% c("var/compiler") %]' + name: '[% c("var/compiler") %]' + enable: '[% c("var/linux") %]' - name: cmake project: cmake - name: ninja diff --git a/rbm.conf b/rbm.conf index c3f778b..e2323db 100644 --- a/rbm.conf +++ b/rbm.conf @@ -444,6 +444,8 @@ targets: LDFLAGS: "-Wl,-syslibroot,$sysrootdir -Wl,-dead_strip -Wl,-pie" macosx_deployment_target: '10.9' locale_ja: ja-JP-mac + # We only support RLBox on the nightly channel for now + rlbox: '[% c("var/nightly") %]' # We only build snowflake on the alpha and nightly # channels for now. snowflake: '[% c("var/alpha") || c("var/nightly") %]'

1 0

[tor-browser-build/master] Bug 34229: Update macOS toolchain for Firefox 78 ESR
by sysrqb＠torproject.org 17 Jul '20

17 Jul '20

commit c51caf4a609c9c3e037b302cb1fba508fea14045 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jul 9 20:31:58 2020 +0000 Bug 34229: Update macOS toolchain for Firefox 78 ESR Clean-up and getting us closer to the way Mozilla is deploying the cross-compilation setup. --- projects/fenix-rust/build | 17 +---------------- projects/firefox/mozconfig-osx-x86_64 | 10 +++++----- projects/libevent/build | 5 ----- projects/macosx-toolchain/build | 4 ++-- projects/macosx-toolchain/config | 3 +++ projects/openssl/build | 2 +- projects/openssl/config | 2 +- projects/rust/build | 17 +---------------- projects/tor/build | 4 +--- rbm.conf | 4 ++-- 10 files changed, 17 insertions(+), 51 deletions(-) diff --git a/projects/fenix-rust/build b/projects/fenix-rust/build index a8f886b..5d3d5c1 100644 --- a/projects/fenix-rust/build +++ b/projects/fenix-rust/build @@ -16,23 +16,8 @@ export PATH="$distdir-rust-old/bin:$PATH" # (i.e. Linux). unset CC unset LDFLAGS - # Target 10.9 as our toolchain does. Without this explicit declaration Bad - # Things will happen, as a lot of dependent code then assumes that the - # official macOS target, x86_64-apple-darwin, essentially means 10.4. - export MACOSX_DEPLOYMENT_TARGET=[% c("var/macosx_deployment_target") %] - # The Rust target for macOS is x86_64-apple-darwin, yet our toolchain is built - # for x86_64-apple-darwin11. We can't mix those targets as clang gets confused - # that way. Changing the Rust target to x86_64-apple-darwin11 would require a - # fair amount of patching, thus we create symlinks to provide Rust with the - # necessary tools while using our toolchain underneath, targeting 10.9. - cd $cctoolsdir - for f in `ls x86_64-apple-darwin11-*`; do - ln -s $f ${f//x86_64-apple-darwin11/x86_64-apple-darwin} - done - cd .. - ln -s x86_64-apple-darwin11 x86_64-apple-darwin - mkdir $distdir/helper + mkdir $distdir/helper # We need to adapt our CFLAGS and make sure our flags are passed down to all # dependencies. Using `CFLAGS_x86_apple-darwin` did not do the trick, so resort # to a wrapper script. diff --git a/projects/firefox/mozconfig-osx-x86_64 b/projects/firefox/mozconfig-osx-x86_64 index 8f088a5..9b0773d 100644 --- a/projects/firefox/mozconfig-osx-x86_64 +++ b/projects/firefox/mozconfig-osx-x86_64 @@ -7,23 +7,23 @@ CROSS_CCTOOLS_PATH=$TOOLCHAIN_DIR/cctools CROSS_SYSROOT=$TOOLCHAIN_DIR/MacOSX10.11.sdk CROSS_PRIVATE_FRAMEWORKS=$CROSS_SYSROOT/System/Library/PrivateFrameworks HARDENING_FLAGS="-Werror=format -Werror=format-security -fstack-protector-strong -D_FORTIFY_SOURCE=2" -FLAGS="-target x86_64-apple-darwin11 -B $CROSS_CCTOOLS_PATH/bin -isysroot $CROSS_SYSROOT $HARDENING_FLAGS" +FLAGS="-target x86_64-apple-darwin -B $CROSS_CCTOOLS_PATH/bin -isysroot $CROSS_SYSROOT $HARDENING_FLAGS" export CC="$TOOLCHAIN_DIR/clang/bin/clang $FLAGS" export CXX="$TOOLCHAIN_DIR/clang/bin/clang++ $FLAGS" export LLVMCONFIG=$TOOLCHAIN_DIR/clang/bin/llvm-config export LDFLAGS="-Wl,-syslibroot,$CROSS_SYSROOT -Wl,-pie" export BINDGEN_CFLAGS="$FLAGS" -export TOOLCHAIN_PREFIX=$CROSS_CCTOOLS_PATH/bin/x86_64-apple-darwin11- +export TOOLCHAIN_PREFIX=$CROSS_CCTOOLS_PATH/bin/x86_64-apple-darwin- export DSYMUTIL="$TOOLCHAIN_DIR/clang/bin/dsymutil" export HOST_CFLAGS="-g" export HOST_CXXFLAGS="-g" export HOST_LDFLAGS="-g" -ac_add_options --target=x86_64-apple-darwin11 -ac_add_options --with-macos-sdk=$CROSS_SYSROOT -ac_add_options --with-macos-private-frameworks=$CROSS_PRIVATE_FRAMEWORKS +ac_add_options --target=x86_64-apple-darwin +export MACOS_SDK_DIR=$CROSS_SYSROOT +export MACOS_PRIVATE_FRAMEWORKS_DIR=$CROSS_PRIVATE_FRAMEWORKS mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-macos mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" diff --git a/projects/libevent/build b/projects/libevent/build index 9c4f190..cc9d6b5 100644 --- a/projects/libevent/build +++ b/projects/libevent/build @@ -5,11 +5,6 @@ distdir=/var/tmp/dist/[% project %] mkdir -p /var/tmp/build tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %] -[% IF c("var/osx") -%] - # Setting this after `configure` but before `make` might be enough, but let's - # not bet on that and just set it here. - export MACOSX_DEPLOYMENT_TARGET=[% c("var/macosx_deployment_target") %] -[% END -%] ./autogen.sh ./configure [% c("var/configure_opt") %] --disable-libevent-regress --disable-samples --prefix=$distdir [% IF c("var/osx") -%] diff --git a/projects/macosx-toolchain/build b/projects/macosx-toolchain/build index f306302..cd19c1d 100644 --- a/projects/macosx-toolchain/build +++ b/projects/macosx-toolchain/build @@ -8,8 +8,8 @@ tar xf [% c('input_files_by_name/clang') %] mv clang "$distdir/clang" tar -C $distdir -xf [% c('input_files_by_name/cctools') %] cd $distdir/cctools/bin -ln -s ../../clang/bin/clang x86_64-apple-darwin11-clang -ln -s ../../clang/bin/clang++ x86_64-apple-darwin11-clang++ +ln -s ../../clang/bin/clang x86_64-apple-darwin-clang +ln -s ../../clang/bin/clang++ x86_64-apple-darwin-clang++ cd "/var/tmp/dist" [% c('tar', { diff --git a/projects/macosx-toolchain/config b/projects/macosx-toolchain/config index b7d5a39..29f7c4b 100644 --- a/projects/macosx-toolchain/config +++ b/projects/macosx-toolchain/config @@ -14,6 +14,7 @@ var: export LD_LIBRARY_PATH=/var/tmp/dist/[% project %]/clang/lib export CC="$clangdir/bin/clang [% c('var/FLAGS') %]" export LDFLAGS="[% c('var/LDFLAGS') %]" + export MACOSX_DEPLOYMENT_TARGET=[% c("var/macosx_deployment_target") %] input_files: - project: container-image @@ -21,6 +22,8 @@ input_files: project: clang - name: cctools project: cctools + # Instructions on how to create the SDK tarball can be found at: + # build/macosx/cross-mozconfig.common - name: SDK URL: https://people.torproject.org/~gk/mirrors/sources/MacOSX10.11.sdk.tar.bz2 sha256sum: d11e410d757d023be66d2fe7eaa85a1d232da3ac04f177eff3d8b8275cd9ffca diff --git a/projects/openssl/build b/projects/openssl/build index 5f275a0..7737f88 100644 --- a/projects/openssl/build +++ b/projects/openssl/build @@ -10,7 +10,7 @@ export CC='gcc -m32' [% END %] [% IF c("var/osx") -%] # Tricking OpenSSL into using our clang as cross-compiler - ln -s $clangdir/bin/clang $clangdir/bin/x86_64-apple-darwin11-cc + ln -s $clangdir/bin/clang $clangdir/bin/x86_64-apple-darwin-cc export CC="cc [% c("var/FLAGS") %]" [% END -%] [% IF c("var/windows") -%] diff --git a/projects/openssl/config b/projects/openssl/config index ab62b14..fd38237 100644 --- a/projects/openssl/config +++ b/projects/openssl/config @@ -21,7 +21,7 @@ targets: openssldir: 'Program Files[% IF c("var/windows-i686") %] (x86)[% END %]/OpenSSL' osx-x86_64: var: - configure_opts: --cross-compile-prefix=x86_64-apple-darwin11- darwin64-x86_64-cc enable-ec_nistp_64_gcc_128 + configure_opts: --cross-compile-prefix=x86_64-apple-darwin- darwin64-x86_64-cc enable-ec_nistp_64_gcc_128 android: var: configure_opts: '[% IF c("var/android-fenix") %]CC=[% c("var/CC") %] android-[% c("var/toolchain_arch") %] -no-shared -D__ANDROID_API__=[% c("var/android_min_api") %][% ELSE %]CC=clang android-[% c("var/toolchain_arch") %] -no-shared[% END %]' diff --git a/projects/rust/build b/projects/rust/build index a8f886b..5d3d5c1 100644 --- a/projects/rust/build +++ b/projects/rust/build @@ -16,23 +16,8 @@ export PATH="$distdir-rust-old/bin:$PATH" # (i.e. Linux). unset CC unset LDFLAGS - # Target 10.9 as our toolchain does. Without this explicit declaration Bad - # Things will happen, as a lot of dependent code then assumes that the - # official macOS target, x86_64-apple-darwin, essentially means 10.4. - export MACOSX_DEPLOYMENT_TARGET=[% c("var/macosx_deployment_target") %] - # The Rust target for macOS is x86_64-apple-darwin, yet our toolchain is built - # for x86_64-apple-darwin11. We can't mix those targets as clang gets confused - # that way. Changing the Rust target to x86_64-apple-darwin11 would require a - # fair amount of patching, thus we create symlinks to provide Rust with the - # necessary tools while using our toolchain underneath, targeting 10.9. - cd $cctoolsdir - for f in `ls x86_64-apple-darwin11-*`; do - ln -s $f ${f//x86_64-apple-darwin11/x86_64-apple-darwin} - done - cd .. - ln -s x86_64-apple-darwin11 x86_64-apple-darwin - mkdir $distdir/helper + mkdir $distdir/helper # We need to adapt our CFLAGS and make sure our flags are passed down to all # dependencies. Using `CFLAGS_x86_apple-darwin` did not do the trick, so resort # to a wrapper script. diff --git a/projects/tor/build b/projects/tor/build index 4345d35..96c2a16 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -90,8 +90,6 @@ openssldir=/var/tmp/dist/openssl/openssl [% IF c("var/osx") %] cp $libeventdir/lib/libevent-*.dylib $TORBINDIR/ - # The target version needs to be set before the configure step. - export MACOSX_DEPLOYMENT_TARGET=[% c("var/macosx_deployment_target") %] [% END %] cd /var/tmp/build/[% project %]-[% c('version') %] @@ -122,7 +120,7 @@ cp $distdir/share/tor/geoip6 $TORCONFIGDIR cd $distdir cp bin/tor $TORBINDIR/ cd $TORBINDIR/ - x86_64-apple-darwin11-install_name_tool -change $libeventdir/lib/$LIBEVENT_FILE @executable_path/$LIBEVENT_FILE tor + x86_64-apple-darwin-install_name_tool -change $libeventdir/lib/$LIBEVENT_FILE @executable_path/$LIBEVENT_FILE tor [% END %] cd $distdir diff --git a/rbm.conf b/rbm.conf index a3850d9..c3f778b 100644 --- a/rbm.conf +++ b/rbm.conf @@ -439,8 +439,8 @@ targets: suite: buster arch: amd64 compiler: 'macosx-toolchain' - configure_opt: '--host=x86_64-apple-darwin11 CC="x86_64-apple-darwin11-clang [% c("var/FLAGS") %]" CXX="x86_64-apple-darwin11-clang++ [% c("var/FLAGS") %]" [% c("var/configure_opt_project") %]' - FLAGS: "-target x86_64-apple-darwin11 -B $cctoolsdir -isysroot $sysrootdir" + configure_opt: '--host=x86_64-apple-darwin CC="x86_64-apple-darwin-clang [% c("var/FLAGS") %]" CXX="x86_64-apple-darwin-clang++ [% c("var/FLAGS") %]" [% c("var/configure_opt_project") %]' + FLAGS: "-target x86_64-apple-darwin -B $cctoolsdir -isysroot $sysrootdir" LDFLAGS: "-Wl,-syslibroot,$sysrootdir -Wl,-dead_strip -Wl,-pie" macosx_deployment_target: '10.9' locale_ja: ja-JP-mac

1 0

[tor-browser-build/master] Bug 40019: Workaround for missing a proper compiler-rt
by sysrqb＠torproject.org 17 Jul '20

17 Jul '20

commit cb9c548344966ea3c50bb56a71459fecff3cc18d Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jul 10 05:57:56 2020 +0000 Bug 40019: Workaround for missing a proper compiler-rt To get nightly builds going we use Mozilla's cross-compiled compiler-rt for now. --- projects/firefox/build | 5 +++++ projects/firefox/config | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/projects/firefox/build b/projects/firefox/build index a9f86bf..1fe4adf 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -14,6 +14,11 @@ mkdir -p [% dest_dir _ '/' _ c('filename') %] cp /var/tmp/dist/mingw-w64/gcclibs/{libssp.a,libssp_nonshared.a} /var/tmp/dist/mingw-w64-clang/[% c("arch") %]-w64-mingw32/lib/ [% END -%] +[% IF c("var/osx") %] + mkdir -p /var/tmp/dist/macosx-toolchain/clang/lib/clang/[% pc("clang", "version") %]/lib/darwin + mv libclang_rt.osx.a /var/tmp/dist/macosx-toolchain/clang/lib/clang/[% pc("clang", "version") %]/lib/darwin +[% END -%] + tar -C /var/tmp/dist -xf [% c('input_files_by_name/rust') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/cbindgen') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/nasm') %] diff --git a/projects/firefox/config b/projects/firefox/config index 2cc734b..874d7d2 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -182,3 +182,9 @@ input_files: # TorButton patch authored by Arthur Edelstein, from https://github.com/arthuredelstein/torbutton/ branch 2.1.10-namecoin - filename: namecoin-etld.patch enable: '[% c("var/namecoin") %]' + # The library is extracted from Mozilla's officially used Clang, downloaded + # from https://firefox-ci-tc.services.mozilla.com/api/queue/v1/task/TYTqgyybSLmp0O…. + # Its SHA-256 sum is 7b0a6e60f102d3dbf618ae9e25d990d4dc72c76eb5accb5974ec70c11ff7e049. + - URL: https://people.torproject.org/~gk/mirrors/sources/libclang_rt.osx.a + sha256sum: 33541fb054e7dc372b5e9708bbcc175561d7fdbc9b00bf964e0c60b82bd8165a + enable: '[% c("var/osx") %]'

1 0

[tor-browser-build/master] Bug 40021: Unbreak our desktop nightly builds
by sysrqb＠torproject.org 17 Jul '20

17 Jul '20

commit 4f98b8d75e7f1b3ece131b8b18f01d41e782d6fb Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jul 10 19:09:41 2020 +0000 Bug 40021: Unbreak our desktop nightly builds --- projects/firefox/config | 2 +- projects/tor-launcher/config | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 874d7d2..2ee16e4 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -8,7 +8,7 @@ git_submodule: 1 gpg_keyring: torbutton.gpg var: - firefox_platform_version: 68.10.1 + firefox_platform_version: 78.0.1 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 10.0 branding_directory: '[% IF c("var/android") %]mobile/android[% ELSE %]browser[% END %]/branding/alpha' diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index f8a974a..9aaca27 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -22,7 +22,5 @@ steps: targets: nightly: version: '[% c("abbrev") %]' - # Hardcode the commit for now so we can start landing ESR 78 patches without - # breaking nightly builds. - git_hash: b4838d339a84c5ebebd91a0ba6b22d44ecda97b1 + git_hash: master tag_gpg_id: 0

1 0