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

[tor-browser-build/master] Bug 24632: Bump clang version in go build script comment
by boklm＠torproject.org 06 Jun '18

06 Jun '18

commit a0130c9a178ae919a400ad014d7f855a282c72b4 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jun 4 06:13:36 2018 +0000 Bug 24632: Bump clang version in go build script comment --- projects/go/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/go/build b/projects/go/build index 5ab4c0c..b9057a5 100644 --- a/projects/go/build +++ b/projects/go/build @@ -52,7 +52,7 @@ cd /var/tmp/dist/go/src # http://golang.org/doc/install/source#environment export GOOS=darwin export GOARCH=amd64 - # faketime is needed because clang 3.8.0 on Darwin embeds the timestamps of + # faketime is needed because clang 3.9.1 on Darwin embeds the timestamps of # certain intermediate object files (including those that arise here while # compiling the Go runtime itself). Without this, variable timestamps would # end up in snowflake-client.

1 0

[tor-browser-build/master] Bug 24632: Adapt tor and OpenSSL for new macOS toolchain
by boklm＠torproject.org 06 Jun '18

06 Jun '18

commit 3b5038d90cac5cfcf6856cc0786cfa99adbc775a Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jun 4 06:03:09 2018 +0000 Bug 24632: Adapt tor and OpenSSL for new macOS toolchain --- projects/openssl/build | 2 +- projects/openssl/config | 2 +- projects/tor/build | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/openssl/build b/projects/openssl/build index 3851346..a3ff092 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-darwin10-cc + ln -s $clangdir/bin/clang $clangdir/bin/x86_64-apple-darwin11-cc export CC="cc [% c("var/FLAGS") %]" [% END -%] ./Configure --prefix=$distdir [% c('var/configure_opts') %] diff --git a/projects/openssl/config b/projects/openssl/config index 3489d42..fe1c5fa 100644 --- a/projects/openssl/config +++ b/projects/openssl/config @@ -19,7 +19,7 @@ targets: configure_opts: '-shared --cross-compile-prefix=[% c("arch") %]-w64-mingw32- mingw[% IF c("var/windows-x86_64") %]64[% END %] "[% c("var/CFLAGS") %] [% c("var/LDFLAGS") %]"' osx-x86_64: var: - configure_opts: --cross-compile-prefix=x86_64-apple-darwin10- darwin64-x86_64-cc enable-ec_nistp_64_gcc_128 + configure_opts: --cross-compile-prefix=x86_64-apple-darwin11- darwin64-x86_64-cc enable-ec_nistp_64_gcc_128 input_files: - project: container-image diff --git a/projects/tor/build b/projects/tor/build index c6d9895..3f845ea 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -88,7 +88,7 @@ cp $distdir/share/tor/geoip6 $TORCONFIGDIR cd $distdir cp bin/tor $TORBINDIR/ cd $TORBINDIR/ - x86_64-apple-darwin10-install_name_tool -change $libeventdir/lib/$LIBEVENT_FILE @executable_path/$LIBEVENT_FILE tor + x86_64-apple-darwin11-install_name_tool -change $libeventdir/lib/$LIBEVENT_FILE @executable_path/$LIBEVENT_FILE tor [% END %] cd $distdir

1 0

[tor-browser-build/master] Bug 26003: Clean up our mozconfig-osx-x86_64 file
by boklm＠torproject.org 04 Jun '18

04 Jun '18

commit 92aa4276c02c1619a9cf70d317c46092ef3ba7c0 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 1 20:18:12 2018 +0000 Bug 26003: Clean up our mozconfig-osx-x86_64 file --- projects/firefox/mozconfig-osx-x86_64 | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/projects/firefox/mozconfig-osx-x86_64 b/projects/firefox/mozconfig-osx-x86_64 index 9ac3ac8..1e30084 100644 --- a/projects/firefox/mozconfig-osx-x86_64 +++ b/projects/firefox/mozconfig-osx-x86_64 @@ -1,24 +1,21 @@ +TOOLCHAIN_DIR=/var/tmp/dist/macosx-toolchain + # ld needs libLTO.so from llvm -mk_add_options "export LD_LIBRARY_PATH=/var/tmp/dist/macosx-toolchain/clang/lib" +mk_add_options "export LD_LIBRARY_PATH=$TOOLCHAIN_DIR/clang/lib" -TOOLCHAIN_DIR=/var/tmp/dist/macosx-toolchain CROSS_CCTOOLS_PATH=$TOOLCHAIN_DIR/cctools CROSS_SYSROOT=$TOOLCHAIN_DIR/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-darwin10 -mlinker-version=136 -B $CROSS_CCTOOLS_PATH/bin -isysroot $CROSS_SYSROOT $HARDENING_FLAGS" +FLAGS="-target x86_64-apple-darwin11 -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 CPP="$TOOLCHAIN_DIR/clang/bin/clang $FLAGS -E" export LLVMCONFIG=$TOOLCHAIN_DIR/clang/bin/llvm-config export LDFLAGS="-Wl,-syslibroot,$CROSS_SYSROOT -Wl,-dead_strip -Wl,-pie" -export TOOLCHAIN_PREFIX=$CROSS_CCTOOLS_PATH/bin/x86_64-apple-darwin10- -#TODO: bug 1184202 - would be nice if these could be detected with TOOLCHAIN_PREFIX automatically -export AR=${TOOLCHAIN_PREFIX}ar -export RANLIB=${TOOLCHAIN_PREFIX}ranlib -export STRIP=${TOOLCHAIN_PREFIX}strip -export OTOOL=${TOOLCHAIN_PREFIX}otool +export BINDGEN_CFLAGS="$FLAGS" +export TOOLCHAIN_PREFIX=$CROSS_CCTOOLS_PATH/bin/x86_64-apple-darwin11- export DSYMUTIL="$TOOLCHAIN_DIR/clang/bin/llvm-dsymutil" export HOST_CC="$TOOLCHAIN_DIR/clang/bin/clang"

1 0

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

04 Jun '18

commit f3e479d86a4ef945279b6a2df4e997ad8a935b0a Merge: 5cf384c 92aa427 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Jun 4 14:21:09 2018 +0200 Merge remote-tracking branch 'gk/bug_26003' projects/firefox/mozconfig-osx-x86_64 | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-)

1 0

[tor-browser-build/master] Bug 26195: Use new cctools for macOS toolchain
by boklm＠torproject.org 04 Jun '18

04 Jun '18

commit 5cf384c54a0dfd3edd44373bb9370e549fcf64f8 Author: Georg Koppen <gk(a)torproject.org> Date: Thu May 31 16:10:53 2018 +0000 Bug 26195: Use new cctools for macOS toolchain --- projects/macosx-toolchain/build | 9 +++++---- projects/macosx-toolchain/config | 5 ++--- rbm.conf | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/projects/macosx-toolchain/build b/projects/macosx-toolchain/build index 94954c5..d1d8c34 100644 --- a/projects/macosx-toolchain/build +++ b/projects/macosx-toolchain/build @@ -8,10 +8,11 @@ tar xf [% c('input_files_by_name/llvm') %] mv llvm "$distdir/clang" tar -C $distdir -xf [% c('input_files_by_name/cctools') %] cd $distdir/cctools/bin -ln -s ../../clang/bin/clang x86_64-apple-darwin10-clang -ln -s ../../clang/bin/clang++ x86_64-apple-darwin10-clang++ -# "go link" expects to find a program called "dsymutil" exactly. -ln -sf x86_64-apple-darwin10-dsymutil dsymutil +ln -s ../../clang/bin/clang x86_64-apple-darwin11-clang +ln -s ../../clang/bin/clang++ x86_64-apple-darwin11-clang++ +# "go link", libevent, and the jemalloc cross-compilation during the Rust build +# expect to find a program called "dsymutil" exactly. +ln -s ../../clang/bin/llvm-dsymutil dsymutil cd "/var/tmp/dist" [% c('tar', { diff --git a/projects/macosx-toolchain/config b/projects/macosx-toolchain/config index ff31abf..8502f57 100644 --- a/projects/macosx-toolchain/config +++ b/projects/macosx-toolchain/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' -version: 10.7-1 +version: 10.11-1 var: container: use_container: 1 @@ -20,8 +20,7 @@ input_files: - name: llvm project: llvm - name: cctools - URL: https://people.torproject.org/~gk/mirrors/sources/cctools.tar.gz - sha256sum: e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 + project: cctools - name: SDK URL: https://people.torproject.org/~gk/mirrors/sources/MacOSX10.11.sdk.tar.bz2 sha256sum: d11e410d757d023be66d2fe7eaa85a1d232da3ac04f177eff3d8b8275cd9ffca diff --git a/rbm.conf b/rbm.conf index 19bee8e..9a30353 100644 --- a/rbm.conf +++ b/rbm.conf @@ -240,8 +240,8 @@ targets: suite: jessie arch: amd64 compiler: 'macosx-toolchain' - configure_opt: '--host=x86_64-apple-darwin10 CC="x86_64-apple-darwin10-clang [% c("var/FLAGS") %]" CXX="x86_64-apple-darwin10-clang++ [% c("var/FLAGS") %]"' - FLAGS: "-target x86_64-apple-darwin10 -mlinker-version=136 -B $cctoolsdir -isysroot $sysrootdir" + 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") %]"' + FLAGS: "-target x86_64-apple-darwin11 -B $cctoolsdir -isysroot $sysrootdir" LDFLAGS: "-Wl,-syslibroot,$sysrootdir -Wl,-dead_strip -Wl,-pie" locale_ja: ja-JP-mac # We only build snowflake for linux and osx on the alpha and nightly

1 0

[tor-browser-build/master] Bug 25548: Use macOS SDK 10.11 for our toolchain
by boklm＠torproject.org 04 Jun '18

04 Jun '18

commit a593f155b82759be202f69f6ba21c793926c7b31 Author: Georg Koppen <gk(a)torproject.org> Date: Thu May 24 20:34:50 2018 +0000 Bug 25548: Use macOS SDK 10.11 for our toolchain --- projects/macosx-toolchain/build | 4 ++-- projects/macosx-toolchain/config | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/macosx-toolchain/build b/projects/macosx-toolchain/build index f974cfc..94954c5 100644 --- a/projects/macosx-toolchain/build +++ b/projects/macosx-toolchain/build @@ -2,8 +2,8 @@ [% c("var/set_default_env") -%] distdir="/var/tmp/dist/[% project %]" mkdir -p "$distdir" -tar xzf [% c('input_files_by_name/SDK') %] -mv MacOSX10.7.sdk "$distdir/SDK" +tar xjf [% c('input_files_by_name/SDK') %] +mv MacOSX10.11.sdk "$distdir/SDK" tar xf [% c('input_files_by_name/llvm') %] mv llvm "$distdir/clang" tar -C $distdir -xf [% c('input_files_by_name/cctools') %] diff --git a/projects/macosx-toolchain/config b/projects/macosx-toolchain/config index bfdbdb6..ff31abf 100644 --- a/projects/macosx-toolchain/config +++ b/projects/macosx-toolchain/config @@ -23,5 +23,5 @@ input_files: URL: https://people.torproject.org/~gk/mirrors/sources/cctools.tar.gz sha256sum: e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 - name: SDK - URL: https://people.torproject.org/~mikeperry/mirrors/sources/MacOSX10.7.sdk.tar… - sha256sum: da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf + URL: https://people.torproject.org/~gk/mirrors/sources/MacOSX10.11.sdk.tar.bz2 + sha256sum: d11e410d757d023be66d2fe7eaa85a1d232da3ac04f177eff3d8b8275cd9ffca

1 0

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

04 Jun '18

commit 90aa993289db466f928244443d2acdf6c8a2652d Merge: ddc77b4 a593f15 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Jun 4 13:58:10 2018 +0200 Merge remote-tracking branch 'gk/bug_25548_v2' projects/macosx-toolchain/build | 4 ++-- projects/macosx-toolchain/config | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)

1 0

[tor-browser-build/master] Bug 25554: Bump mingw-w64 version for Firefox 60 ESR
by boklm＠torproject.org 04 Jun '18

04 Jun '18

commit 4c1f78c312aa10ff54e5b07de4ef3278ab2ed01e Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jun 4 11:11:56 2018 +0000 Bug 25554: Bump mingw-w64 version for Firefox 60 ESR --- projects/mingw-w64/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/mingw-w64/config b/projects/mingw-w64/config index fb9ef21..b9185f3 100644 --- a/projects/mingw-w64/config +++ b/projects/mingw-w64/config @@ -1,7 +1,7 @@ # 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: 1259532ff8f5a7ac625b2f28d499ee93a0c0841e +git_hash: ee9fc3d0b8c8868280e38384edd968067b8e71fc version: '[% c("abbrev") %]' var: container:

1 0

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

04 Jun '18

commit ddc77b4d679b3027924b89350dce9b672967e625 Merge: ba7b30a 4c1f78c Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Jun 4 13:44:20 2018 +0200 Merge remote-tracking branch 'gk/bug_25554_v2' projects/mingw-w64/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor-browser-build/master] Bug 25860: Clean up OpenSSL's configure options for Windows
by gk＠torproject.org 04 Jun '18

04 Jun '18

commit ba7b30a920172233392fd9dc176631c3da25d5f0 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri May 25 18:53:40 2018 +0200 Bug 25860: Clean up OpenSSL's configure options for Windows Avoid duplicating Windows CFLAGS and LDFLAGS. Instead, use the flags defined in rbm.conf. This also means we are now using -fstack-protector-strong instead of -fstack-protector-all for building openssl. We update the CFLAGS/LDFLAGS defined in rbm.conf to move var/flag_mwindows at the end, because openssl's Configure script does not like having an argument starting with a space. --- projects/openssl/config | 3 ++- rbm.conf | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/projects/openssl/config b/projects/openssl/config index 9c191fa..3489d42 100644 --- a/projects/openssl/config +++ b/projects/openssl/config @@ -15,7 +15,8 @@ targets: configure_opts: -shared linux-generic32 windows: var: - configure_opts: '-shared --cross-compile-prefix=[% c("arch") %]-w64-mingw32- mingw[% IF c("var/windows-x86_64") %]64[% END %] "-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"' + flag_mwindows: '' + configure_opts: '-shared --cross-compile-prefix=[% c("arch") %]-w64-mingw32- mingw[% IF c("var/windows-x86_64") %]64[% END %] "[% c("var/CFLAGS") %] [% c("var/LDFLAGS") %]"' osx-x86_64: var: configure_opts: --cross-compile-prefix=x86_64-apple-darwin10- darwin64-x86_64-cc enable-ec_nistp_64_gcc_128 diff --git a/rbm.conf b/rbm.conf index 0d6de69..19bee8e 100644 --- a/rbm.conf +++ b/rbm.conf @@ -216,8 +216,8 @@ targets: container: suite: jessie configure_opt: '--host=[% c("arch") %]-w64-mingw32 CFLAGS="[% c("var/CFLAGS") %]" LDFLAGS="[% c("var/LDFLAGS") %]"' - CFLAGS: '[% c("var/flag_mwindows") %] -fstack-protector-strong -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security' - LDFLAGS: '[% c("var/flag_mwindows") %] -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp -lssp -L$gcclibs' + CFLAGS: '-fstack-protector-strong -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security [% c("var/flag_mwindows") %]' + LDFLAGS: '-Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp -lssp -L$gcclibs [% c("var/flag_mwindows") %]' flag_mwindows: '-mwindows' compiler: mingw-w64 deps:

1 0