June 2018 - tbb-commits - lists.torproject.org

[tor-browser-build/master] Bug 25859: Clean up zlib's build script
by gk＠torproject.org 04 Jun '18

04 Jun '18

commit 0e483da11bd8de64b3b881ef3484ae77f69759ed Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri May 25 19:48:38 2018 +0200 Bug 25859: Clean up zlib's build script CFLAGS and LDFLAGS were unused. We are now defining them in LOC, using the definition of CFLAGS and LDFLAGS from rbm.conf. We also don't hardcode anymore -j4. --- projects/zlib/build | 6 ++---- projects/zlib/config | 1 + 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/projects/zlib/build b/projects/zlib/build index ef26882..fe1377f 100644 --- a/projects/zlib/build +++ b/projects/zlib/build @@ -5,10 +5,8 @@ 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') %] -export CFLAGS="[% c("var/CFLAGS") %]" -export LDFLAGS="[% c("var/LDFLAGS") %]" -make BINARY_PATH=$distdir/lib INCLUDE_PATH=$distdir/include LIBRARY_PATH=$distdir/lib -f win32/Makefile.gcc PREFIX=[% c("arch") %]-w64-mingw32- -j4 SHARED_MODE=1 LOC="-fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp -lssp -L$gcclibs" -make BINARY_PATH=$distdir/lib INCLUDE_PATH=$distdir/include LIBRARY_PATH=$distdir/lib -f win32/Makefile.gcc PREFIX=[% c("arch") %]-w64-mingw32- -j4 SHARED_MODE=1 LOC="-fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp -lssp -L$gcclibs" install +make BINARY_PATH=$distdir/lib INCLUDE_PATH=$distdir/include LIBRARY_PATH=$distdir/lib -f win32/Makefile.gcc PREFIX=[% c("arch") %]-w64-mingw32- -j[% c("buildconf/num_procs") %] SHARED_MODE=1 LOC="[% c("var/CFLAGS") %] [% c("var/LDFLAGS") %]" +make BINARY_PATH=$distdir/lib INCLUDE_PATH=$distdir/include LIBRARY_PATH=$distdir/lib -f win32/Makefile.gcc PREFIX=[% c("arch") %]-w64-mingw32- -j[% c("buildconf/num_procs") %] SHARED_MODE=1 LOC="[% c("var/CFLAGS") %] [% c("var/LDFLAGS") %]" install cd /var/tmp/dist [% c('tar', { diff --git a/projects/zlib/config b/projects/zlib/config index 3ad562c..4ac96c9 100644 --- a/projects/zlib/config +++ b/projects/zlib/config @@ -7,6 +7,7 @@ gpg_keyring: zlib.gpg tag_gpg_id: 1 var: + flag_mwindows: '' container: use_container: 1

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_25859_v4'
by gk＠torproject.org 04 Jun '18

04 Jun '18

commit fb97d6c9141d3a824954b2e2952974daeada26d7 Merge: 4d5e3d2 0e483da Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jun 4 10:50:51 2018 +0000 Merge remote-tracking branch 'boklm/bug_25859_v4' projects/zlib/build | 6 ++---- projects/zlib/config | 1 + 2 files changed, 3 insertions(+), 4 deletions(-)

1 0

[tor-browser-build/master] Bug 25894: Get a Rust cross-compiler for Windows
by boklm＠torproject.org 04 Jun '18

04 Jun '18

commit 4d5e3d2ba5422b931a2e32a9498feabec6ecc23e Author: Georg Koppen <gk(a)torproject.org> Date: Mon Apr 30 21:58:41 2018 +0000 Bug 25894: Get a Rust cross-compiler for Windows --- projects/rust/build | 14 +++++++++++--- projects/rust/config | 9 +++++++++ projects/rust/panic-abort.patch | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 56 insertions(+), 3 deletions(-) diff --git a/projects/rust/build b/projects/rust/build index 4c81ad8..69bc3a7 100644 --- a/projects/rust/build +++ b/projects/rust/build @@ -10,9 +10,7 @@ cd /var/tmp/dist/rust-[% c('var/prev_version') %]-[% c('arch') %]-unknown-linux- ./install.sh --prefix=$distdir-rust-old export PATH="$distdir-rust-old/bin:$PATH" -[% IF ! c("var/windows") %] - [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] -[% END -%] +[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] [% IF c("var/osx") %] # We need to clear `CC` and `LDFLAGS` as they are used for the host platform @@ -61,6 +59,16 @@ cd /var/tmp/build/rustc-[% c('version') %]-src patch -p1 < $rootdir/binaryen.patch [% END %] +[% IF c("var/windows-i686") %] + # Cross-compiling for Windows 32bit is currently not possible without any + # patches. The reason for that is libstd expecting DWARF unwinding while most + # toolchains on Linux, targeting Windows 32bit, use SjLj unwinding. + # See: https://github.com/rust-lang/rust/issues/12859 for discussion about + # that and https://github.com/rust-lang/rust/pull/49633 for a newer attempt to + # fix this problem. + patch -p1 < $rootdir/panic-abort.patch +[% END %] + mkdir build cd build ../configure --prefix=$distdir [% c("var/configure_opt") %] diff --git a/projects/rust/config b/projects/rust/config index ae2290b..9d3030d 100644 --- a/projects/rust/config +++ b/projects/rust/config @@ -48,6 +48,13 @@ targets: - pkg-config configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --target=x86_64-apple-darwin --set=target.x86_64-apple-darwin.cc=x86_64-apple-darwin-clang + windows: + var: + arch_deps: + - libssl-dev + - pkg-config + configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --target=[% c("arch") %]-pc-windows-gnu + input_files: - project: container-image - project: cmake @@ -66,3 +73,5 @@ input_files: gpg_keyring: rust.gpg - filename: binaryen.patch enable: '[% c("var/linux") %]' + - filename: panic-abort.patch + enable: '[% c("var/windows-i686") %]' diff --git a/projects/rust/panic-abort.patch b/projects/rust/panic-abort.patch new file mode 100644 index 0000000..1711ff7 --- /dev/null +++ b/projects/rust/panic-abort.patch @@ -0,0 +1,36 @@ +From 2fe471643721f3967f1bdf28907b0a7247fdb705 Mon Sep 17 00:00:00 2001 +From: Georg Koppen <gk(a)torproject.org> +Date: Thu, 26 Apr 2018 13:18:27 +0000 +Subject: [PATCH] Avoid cross-compilation breakage due to unwinding + incompatibilities + + +diff --git a/src/bootstrap/bin/rustc.rs b/src/bootstrap/bin/rustc.rs +index 55d104b182..85330f973b 100644 +--- a/src/bootstrap/bin/rustc.rs ++++ b/src/bootstrap/bin/rustc.rs +@@ -143,7 +143,8 @@ fn main() { + // workaround undefined references to `rust_eh_unwind_resume` generated + // otherwise, see issue https://github.com/rust-lang/rust/issues/43095. + if crate_name == "panic_abort" || +- crate_name == "compiler_builtins" && stage != "0" { ++ crate_name == "compiler_builtins" && stage != "0" || ++ target == "i686-pc-windows-gnu" { + cmd.arg("-C").arg("panic=abort"); + } + +diff --git a/src/libtest/lib.rs b/src/libtest/lib.rs +index 9ea5f39b71..bb689120af 100644 +--- a/src/libtest/lib.rs ++++ b/src/libtest/lib.rs +@@ -45,7 +45,6 @@ extern crate getopts; + extern crate term; + #[cfg(any(unix, target_os = "cloudabi"))] + extern crate libc; +-extern crate panic_unwind; + + pub use self::TestFn::*; + pub use self::ColorConfig::*; +-- +2.17.0 +

1 0

[tor-browser-build/master] Bug 25832: Enable pthread support for mingw-w64
by boklm＠torproject.org 04 Jun '18

04 Jun '18

commit 9af1ea49a225b3a8582be29172cc3f25ef5c215b Author: Georg Koppen <gk(a)torproject.org> Date: Wed Apr 18 08:20:33 2018 +0000 Bug 25832: Enable pthread support for mingw-w64 Since bug 1406542 landed on Mozilla central pthread support is required for mingw-w64. This patch adds it and removes a wrong sed command related to our msvcrt->msvcr100 replacement. --- projects/mingw-w64/build | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/projects/mingw-w64/build b/projects/mingw-w64/build index b0ce69d..502ea94 100644 --- a/projects/mingw-w64/build +++ b/projects/mingw-w64/build @@ -22,15 +22,14 @@ cd /var/tmp/build mkdir gcc cd gcc tar xJf $rootdir/gcc-[% c("var/gcc_version") %].tar.xz -# We don't want to link against msvcrt.dll due to bug 9084. +# We don't want to link against msvcrt.dll due to bug 9084 and want to use +# pthreads, too, as this is needed for ESR60, at least due to bug 1406542. [% c("arch") %]-w64-mingw32-g++ -dumpspecs > $distdir/msvcr100.spec -sed 's/msvcrt/msvcr100/' -i $distdir/msvcr100.spec -# Linking libgcc against msvcrt is hard-coded... -sed 's/msvcrt/msvcr100/' -i gcc-[% c("var/gcc_version") %]/gcc/config/i386/t-mingw-w32 +sed 's/msvcrt/msvcr100 -lpthread/' -i $distdir/msvcr100.spec # LDFLAGS_FOR_TARGET does not work for some reason. Thus, we take # CFLAGS_FOR_TARGET. export CFLAGS_FOR_TARGET="-specs=$distdir/msvcr100.spec -Wl,--nxcompat -Wl,--dynamicbase -Wl,--no-insert-timestamp" -gcc-[% c("var/gcc_version") %]/configure --prefix=$distdir --target=[% c("arch") %]-w64-mingw32 --disable-multilib --enable-languages=c,c++ +gcc-[% c("var/gcc_version") %]/configure --prefix=$distdir --target=[% c("arch") %]-w64-mingw32 --with-gnu-ld --with-gnu-as --disable-multilib --enable-threads=posix --enable-languages=c,c++ make -j[% c("buildconf/num_procs") %] all-gcc make install-gcc @@ -41,6 +40,13 @@ cd /var/tmp/build/builddir/mingw-w64/mingw-w64-crt32 make -j[% c("buildconf/num_procs") %] make install +mkdir -p /var/tmp/build/builddir/mingw-w64/mingw-w64-pthread +cd /var/tmp/build/builddir/mingw-w64/mingw-w64-pthread +/var/tmp/build/[% project %]-[% c("version") %]/mingw-w64-libraries/winpthreads/configure \ + --host=[% c("arch") %]-w64-mingw32 --prefix=$distdir/[% c("arch") %]-w64-mingw32 +make -j[% c("buildconf/num_procs") %] +make install + mkdir -p /var/tmp/build/builddir/mingw-w64/widl32 cd /var/tmp/build/builddir/mingw-w64/widl32 /var/tmp/build/[% project %]-[% c("version") %]/mingw-w64-tools/widl/configure \

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gk/bug_9711_v2'
by boklm＠torproject.org 01 Jun '18

01 Jun '18

commit 966c55d754aaf7d181e85d73474d4014eb72a6ac Merge: ef90f3c 94b31b1 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Jun 1 12:51:24 2018 +0200 Merge remote-tracking branch 'gk/bug_9711_v2' projects/cctools/build | 24 ++++++++++++++++++++++++ projects/cctools/config | 16 ++++++++++++++++ 2 files changed, 40 insertions(+)

1 0

[tor-browser-build/master] Bug 9711: Build own cctools for macOS cross-compilation
by boklm＠torproject.org 01 Jun '18

01 Jun '18

commit 94b31b1822961b25fec66078bcf48a279d6e9aa6 Author: Georg Koppen <gk(a)torproject.org> Date: Mon May 21 14:13:40 2018 +0000 Bug 9711: Build own cctools for macOS cross-compilation --- projects/cctools/build | 24 ++++++++++++++++++++++++ projects/cctools/config | 16 ++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/projects/cctools/build b/projects/cctools/build new file mode 100644 index 0000000..cad9e3a --- /dev/null +++ b/projects/cctools/build @@ -0,0 +1,24 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +distdir=/var/tmp/dist/[% project %] +mkdir -p /var/tmp/dist +tar -C /var/tmp/dist -xf [% c('input_files_by_name/llvm') %] +export PATH="/var/tmp/dist/llvm/bin:$PATH" +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++ +./autogen.sh +./configure --prefix=$distdir --target=x86_64-apple-darwin11 --with-llvm-config=llvm-config +export LDFLAGS=-lpthread + +make -j[% c("buildconf/num_procs") %] install + +cd /var/tmp/dist +[% c('tar', { + tar_src => [ project ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] + diff --git a/projects/cctools/config b/projects/cctools/config new file mode 100644 index 0000000..cb84ec4 --- /dev/null +++ b/projects/cctools/config @@ -0,0 +1,16 @@ +# vim: filetype=yaml sw=2 +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 +git_url: https://github.com/tpoechtrager/cctools-port + +var: + container: + use_container: 1 + +input_files: + - project: container-image + - name: llvm + project: llvm

1 0

[tor-browser-build/master] Bug 26249: Update libevent to fix macOS cross-compilation
by boklm＠torproject.org 01 Jun '18

01 Jun '18

commit ef90f3c7881467df0500674dae84d44e247d459c Author: Georg Koppen <gk(a)torproject.org> Date: Thu May 31 15:34:56 2018 +0000 Bug 26249: Update libevent to fix macOS cross-compilation --- keyring/libevent.gpg | Bin 61408 -> 1782 bytes projects/libevent/autotools-openssl-mac.patch | 26 ++++++++++++++++++++++++++ projects/libevent/build | 3 +++ projects/libevent/config | 4 +++- projects/tor/build | 2 +- 5 files changed, 33 insertions(+), 2 deletions(-) diff --git a/keyring/libevent.gpg b/keyring/libevent.gpg index ca92300..b287e04 100644 Binary files a/keyring/libevent.gpg and b/keyring/libevent.gpg differ diff --git a/projects/libevent/autotools-openssl-mac.patch b/projects/libevent/autotools-openssl-mac.patch new file mode 100644 index 0000000..1ee2964 --- /dev/null +++ b/projects/libevent/autotools-openssl-mac.patch @@ -0,0 +1,26 @@ +From 506df426dbeb0187bbd3654bd286b4100628fb16 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Carlo=20Marcelo=20Arenas=20Bel=C3=B3n?= <carenas(a)gmail.com> +Date: Tue, 29 Aug 2017 00:44:57 -0700 +Subject: [PATCH] autotools: confirm openssl is working before using + +latest versions of macOS provide pkg-config and libraries for an ancient +version of openssl as part of the system, but no headers + +diff --git a/m4/libevent_openssl.m4 b/m4/libevent_openssl.m4 +index c2040595..7b458134 100644 +--- a/m4/libevent_openssl.m4 ++++ b/m4/libevent_openssl.m4 +@@ -39,6 +39,10 @@ case "$enable_openssl" in + done + ;; + esac ++ CPPFLAGS_SAVE=$CPPFLAGS ++ CPPFLAGS+=$OPENSSL_INCS ++ AC_CHECK_HEADERS([openssl/ssl.h], [], [have_openssl=no]) ++ CPPFLAGS=$CPPFLAGS_SAVE + AC_SUBST(OPENSSL_INCS) + AC_SUBST(OPENSSL_LIBS) + case "$have_openssl" in +-- +2.17.0 + diff --git a/projects/libevent/build b/projects/libevent/build index a38422a..00ee78c 100644 --- a/projects/libevent/build +++ b/projects/libevent/build @@ -5,6 +5,9 @@ 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") -%] + patch -p1 < $rootdir/autotools-openssl-mac.patch +[% END -%] ./autogen.sh ./configure --disable-static [% c("var/configure_opt") %] --prefix=$distdir [% IF c("var/osx") -%] diff --git a/projects/libevent/config b/projects/libevent/config index 46cbb7e..386f746 100644 --- a/projects/libevent/config +++ b/projects/libevent/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2.0.22 +version: 2.1.8 git_url: https://github.com/libevent/libevent.git git_hash: 'release-[% c("version") %]-stable' tag_gpg_id: 1 @@ -20,3 +20,5 @@ input_files: - project: container-image - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' + - filename: autotools-openssl-mac.patch + enable: '[% c("var/osx") %]' diff --git a/projects/tor/build b/projects/tor/build index bf7db83..c6d9895 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -39,7 +39,7 @@ openssldir=/var/tmp/dist/openssl mkdir -p "$distdir/Debug/Tor" cp $openssldir/lib/libssl.so.1.0.0 "$distdir/Tor/" cp $openssldir/lib/libcrypto.so.1.0.0 "$distdir/Tor/" - cp $libeventdir/lib/libevent-2.0.so.5 "$distdir/Tor/" + cp $libeventdir/lib/libevent-2.1.so.6 "$distdir/Tor/" # We need to copy the libstdc++.so.6 for Tor Browser on older Linux distros. # Copying it into /Browser, which feels more natural, and amending # LD_LIBRARY_PATH breaks updates from a Tor Browser with the old

1 0