- tbb-commits - lists.torproject.org

[tor-browser-build/master] fixup! Bug 31465: Set proper MACOSX_DEPLOYMENT_TARGET for tor and libevent
by gk＠torproject.org 22 Aug '19

22 Aug '19

commit 0be0e0461475a29b5c01ad3b841030633c345179 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Aug 21 20:16:38 2019 +0200 fixup! Bug 31465: Set proper MACOSX_DEPLOYMENT_TARGET for tor and libevent --- projects/libevent/build | 2 +- projects/tor/build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/libevent/build b/projects/libevent/build index 0ec76b6..de9ba80 100644 --- a/projects/libevent/build +++ b/projects/libevent/build @@ -9,7 +9,7 @@ cd /var/tmp/build/[% project %]-[% c('version') %] patch -p1 < $rootdir/autotools-openssl-mac.patch # 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=10.9 + export MACOSX_DEPLOYMENT_TARGET=[% c("var/macosx_deployment_target") %] [% END -%] ./autogen.sh ./configure --disable-static [% c("var/configure_opt") %] --prefix=$distdir diff --git a/projects/tor/build b/projects/tor/build index 8737716..6b684a0 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -73,7 +73,7 @@ openssldir=/var/tmp/dist/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=10.9 + export MACOSX_DEPLOYMENT_TARGET=[% c("var/macosx_deployment_target") %] [% END %] cd /var/tmp/build/[% project %]-[% c('version') %]

1 0

[tor-browser-build/master] Bug 31465: Bump Go to 1.12.9
by gk＠torproject.org 22 Aug '19

22 Aug '19

commit 15d4645a678b12e093f5db89f60f726275f508f6 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Aug 20 08:17:15 2019 +0000 Bug 31465: Bump Go to 1.12.9 This is not only a fix for macOS notarization related issues but picks up security fixes as well (see: #31456). --- projects/go/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/go/config b/projects/go/config index c2baeca..fd96bb6 100644 --- a/projects/go/config +++ b/projects/go/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.12.5 +version: 1.12.9 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: @@ -91,7 +91,7 @@ input_files: enable: '[% c("var/windows") || c("var/osx") %]' - URL: 'https://golang.org/dl/go[% c("version") %].src.tar.gz' name: go - sha256sum: 2aa5f088cbb332e73fc3def546800616b38d3bfe6b8713b8a6404060f22503e8 + sha256sum: ab0e56ed9c4732a653ed22e232652709afbf573e710f56a07f7fdeca578d62fc - URL: 'https://golang.org/dl/go[% c("var/go14_version") %].src.tar.gz' name: go14 sha256sum: 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959

1 0

[tor-browser-build/master] Bug 30323: Bump MACOSX_DEPLOYMENT_TARGET
by gk＠torproject.org 22 Aug '19

22 Aug '19

commit 3c36d79abdb6b56c67ff42f844c6f8a2d6dbce3c Author: Georg Koppen <gk(a)torproject.org> Date: Mon Aug 19 18:19:43 2019 +0000 Bug 30323: Bump MACOSX_DEPLOYMENT_TARGET --- projects/rust/build | 4 ++-- projects/snowflake/build | 6 +++--- projects/snowflake/config | 1 + projects/webrtc/build | 4 ++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/projects/rust/build b/projects/rust/build index 633604c..592c6ea 100644 --- a/projects/rust/build +++ b/projects/rust/build @@ -17,10 +17,10 @@ export PATH="$distdir-rust-old/bin:$PATH" # (i.e. Linux). unset CC unset LDFLAGS - # Target 10.7 as our toolchain does. Without this explicit declaration Bad + # 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=10.7 + export MACOSX_DEPLOYMENT_TARGET=10.9 # 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 diff --git a/projects/snowflake/build b/projects/snowflake/build index daeb185..ae0ebea 100644 --- a/projects/snowflake/build +++ b/projects/snowflake/build @@ -16,9 +16,9 @@ distdir=/var/tmp/dist/[% project %] mkdir -p $PTDIR $DOCSDIR [% IF c("var/osx") %] export CGO_ENABLED=1 - export CGO_CFLAGS="[% c("var/FLAGS") %] -mmacosx-version-min=10.7" - export CGO_CXXFLAGS="[% c("var/FLAGS") %] -stdlib=libc++ -mmacosx-version-min=10.7" - export CGO_LDFLAGS="[% c("var/FLAGS") %] -stdlib=libc++ -mmacosx-version-min=10.7" + export CGO_CFLAGS="[% c("var/FLAGS") %] -mmacosx-version-min=10.9" + export CGO_CXXFLAGS="[% c("var/FLAGS") %] -stdlib=libc++ -mmacosx-version-min=10.9" + export CGO_LDFLAGS="[% c("var/FLAGS") %] -stdlib=libc++ -mmacosx-version-min=10.9" export CC="$clangdir/bin/clang" export CXX="$clangdir/bin/clang++" [% END %] diff --git a/projects/snowflake/config b/projects/snowflake/config index 468b704..cef0930 100644 --- a/projects/snowflake/config +++ b/projects/snowflake/config @@ -22,6 +22,7 @@ targets: osx-x86_64: var: arch_deps: + - pkg-config - faketime input_files: diff --git a/projects/webrtc/build b/projects/webrtc/build index ecbccb3..e84a0b1 100644 --- a/projects/webrtc/build +++ b/projects/webrtc/build @@ -66,7 +66,7 @@ print("$sysrootdir") print("10.11") EOF cat <<EOF > build/config/mac/sdk_info.py -print("machine_os_build=\"10.7\"") +print("machine_os_build=\"10.9\"") print("sdk_build=\"10.11\"") print("sdk_path=\"$sysrootdir\"") print("sdk_platform_path=\"$sysrootdir\"") @@ -115,7 +115,7 @@ GN_ARGS+=" use_custom_libcxx=false" #GN_ARGS+=" rtc_include_tests=false" [% END -%] [% IF c("var/osx") -%] - GN_ARGS+=" target_os=\"mac\" target_cpu=\"x64\" mac_deployment_target=\"10.7\"" + GN_ARGS+=" target_os=\"mac\" target_cpu=\"x64\" mac_deployment_target=\"10.9\"" GN_ARGS+=" clang_use_chrome_plugins=false" GN_ARGS+=" clang_base_path=\"$clangdir\"" # No lld in our toolchain currently.

1 0

[tor-browser-build/master] fixup! Bug 30323: Bump MACOSX_DEPLOYMENT_TARGET
by gk＠torproject.org 22 Aug '19

22 Aug '19

commit 7a01c99641fcdc88a94c94dccb2698fbb7d82bee Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Aug 21 20:15:29 2019 +0200 fixup! Bug 30323: Bump MACOSX_DEPLOYMENT_TARGET --- projects/go-webrtc/config | 6 +++--- projects/rust/build | 4 ++-- projects/snowflake/build | 6 +++--- projects/webrtc/build | 4 ++-- rbm.conf | 1 + 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/projects/go-webrtc/config b/projects/go-webrtc/config index ba1e801..fcf6e89 100644 --- a/projects/go-webrtc/config +++ b/projects/go-webrtc/config @@ -27,9 +27,9 @@ var: [% END -%] [% IF c("var/osx") -%] export CGO_ENABLED=1 - export CGO_CFLAGS="[% c("var/FLAGS") %] -mmacosx-version-min=10.7" - export CGO_CXXFLAGS="[% c("var/FLAGS") %] -stdlib=libc++ -mmacosx-version-min=10.7" - export CGO_LDFLAGS="[% c("var/FLAGS") %] -stdlib=libc++ -mmacosx-version-min=10.7" + export CGO_CFLAGS="[% c("var/FLAGS") %] -mmacosx-version-min=[% c("var/macosx_deployment_target") %]" + export CGO_CXXFLAGS="[% c("var/FLAGS") %] -stdlib=libc++ -mmacosx-version-min=[% c("var/macosx_deployment_target") %]" + export CGO_LDFLAGS="[% c("var/FLAGS") %] -stdlib=libc++ -mmacosx-version-min=[% c("var/macosx_deployment_target") %]" export CC="$clangdir/bin/clang" export CXX="$clangdir/bin/clang++" [% END -%] diff --git a/projects/rust/build b/projects/rust/build index 9624c2f..5cf8c02 100644 --- a/projects/rust/build +++ b/projects/rust/build @@ -20,12 +20,12 @@ export PATH="$distdir-rust-old/bin:$PATH" # 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=10.9 + 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.7. + # 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} diff --git a/projects/snowflake/build b/projects/snowflake/build index ae0ebea..6534329 100644 --- a/projects/snowflake/build +++ b/projects/snowflake/build @@ -16,9 +16,9 @@ distdir=/var/tmp/dist/[% project %] mkdir -p $PTDIR $DOCSDIR [% IF c("var/osx") %] export CGO_ENABLED=1 - export CGO_CFLAGS="[% c("var/FLAGS") %] -mmacosx-version-min=10.9" - export CGO_CXXFLAGS="[% c("var/FLAGS") %] -stdlib=libc++ -mmacosx-version-min=10.9" - export CGO_LDFLAGS="[% c("var/FLAGS") %] -stdlib=libc++ -mmacosx-version-min=10.9" + export CGO_CFLAGS="[% c("var/FLAGS") %] -mmacosx-version-min=[% c("var/macosx_deployment_target") %]" + export CGO_CXXFLAGS="[% c("var/FLAGS") %] -stdlib=libc++ -mmacosx-version-min=[% c("var/macosx_deployment_target") %]" + export CGO_LDFLAGS="[% c("var/FLAGS") %] -stdlib=libc++ -mmacosx-version-min=[% c("var/macosx_deployment_target") %]" export CC="$clangdir/bin/clang" export CXX="$clangdir/bin/clang++" [% END %] diff --git a/projects/webrtc/build b/projects/webrtc/build index e84a0b1..77d4026 100644 --- a/projects/webrtc/build +++ b/projects/webrtc/build @@ -66,7 +66,7 @@ print("$sysrootdir") print("10.11") EOF cat <<EOF > build/config/mac/sdk_info.py -print("machine_os_build=\"10.9\"") +print("machine_os_build=\"[% c("var/macosx_deployment_target") %]\"") print("sdk_build=\"10.11\"") print("sdk_path=\"$sysrootdir\"") print("sdk_platform_path=\"$sysrootdir\"") @@ -115,7 +115,7 @@ GN_ARGS+=" use_custom_libcxx=false" #GN_ARGS+=" rtc_include_tests=false" [% END -%] [% IF c("var/osx") -%] - GN_ARGS+=" target_os=\"mac\" target_cpu=\"x64\" mac_deployment_target=\"10.9\"" + GN_ARGS+=" target_os=\"mac\" target_cpu=\"x64\" mac_deployment_target=\"[% c("var/macosx_deployment_target") %]\"" GN_ARGS+=" clang_use_chrome_plugins=false" GN_ARGS+=" clang_base_path=\"$clangdir\"" # No lld in our toolchain currently. diff --git a/rbm.conf b/rbm.conf index d6c0926..c7c3320 100644 --- a/rbm.conf +++ b/rbm.conf @@ -334,6 +334,7 @@ targets: 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" + macosx_deployment_target: '10.9' locale_ja: ja-JP-mac # We only build snowflake for linux and macOS on the alpha and nightly # channels for now.

1 0

[tor-browser-build/master] Bug 31465: Make SDK version explicit in directory
by gk＠torproject.org 22 Aug '19

22 Aug '19

commit 859c6e9dd35010047749372791062e47d2464eea Author: Georg Koppen <gk(a)torproject.org> Date: Tue Aug 20 11:00:41 2019 +0000 Bug 31465: Make SDK version explicit in directory --- projects/firefox/mozconfig-osx-x86_64 | 2 +- projects/macosx-toolchain/build | 2 +- projects/macosx-toolchain/config | 2 +- projects/rust/build | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/firefox/mozconfig-osx-x86_64 b/projects/firefox/mozconfig-osx-x86_64 index 5d82d12..188bcc9 100644 --- a/projects/firefox/mozconfig-osx-x86_64 +++ b/projects/firefox/mozconfig-osx-x86_64 @@ -4,7 +4,7 @@ TOOLCHAIN_DIR=/var/tmp/dist/macosx-toolchain mk_add_options "export LD_LIBRARY_PATH=$TOOLCHAIN_DIR/clang/lib" CROSS_CCTOOLS_PATH=$TOOLCHAIN_DIR/cctools -CROSS_SYSROOT=$TOOLCHAIN_DIR/SDK +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" diff --git a/projects/macosx-toolchain/build b/projects/macosx-toolchain/build index c9cd282..f306302 100644 --- a/projects/macosx-toolchain/build +++ b/projects/macosx-toolchain/build @@ -3,7 +3,7 @@ distdir="/var/tmp/dist/[% project %]" mkdir -p "$distdir" tar xjf [% c('input_files_by_name/SDK') %] -mv MacOSX10.11.sdk "$distdir/SDK" +mv MacOSX10.11.sdk "$distdir/" tar xf [% c('input_files_by_name/clang') %] mv clang "$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 57e471f..b7d5a39 100644 --- a/projects/macosx-toolchain/config +++ b/projects/macosx-toolchain/config @@ -7,7 +7,7 @@ var: setup: | mkdir -p /var/tmp/dist tar -C /var/tmp/dist -xf $rootdir/[% c("compiler_tarfile") %] - export sysrootdir=/var/tmp/dist/[% project %]/SDK/ + export sysrootdir=/var/tmp/dist/[% project %]/MacOSX10.11.sdk/ export clangdir=/var/tmp/dist/[% project %]/clang export cctoolsdir=/var/tmp/dist/[% project %]/cctools/bin export PATH="$clangdir/bin:$cctoolsdir:$PATH" diff --git a/projects/rust/build b/projects/rust/build index 592c6ea..9624c2f 100644 --- a/projects/rust/build +++ b/projects/rust/build @@ -40,7 +40,7 @@ export PATH="$distdir-rust-old/bin:$PATH" cat > $distdir/helper/x86_64-apple-darwin-clang << 'EOF' #!/bin/sh BASEDIR=/var/tmp/dist/macosx-toolchain -$BASEDIR/cctools/bin/x86_64-apple-darwin-clang -target x86_64-apple-darwin -B $BASEDIR/cctools/bin -isysroot $BASEDIR/SDK/ -Wl,-syslibroot,$BASEDIR/SDK/ -Wl,-dead_strip -Wl,-pie "$@" +$BASEDIR/cctools/bin/x86_64-apple-darwin-clang -target x86_64-apple-darwin -B $BASEDIR/cctools/bin -isysroot $BASEDIR/MacOSX10.11.sdk/ -Wl,-syslibroot,$BASEDIR/MacOSX10.11.sdk/ -Wl,-dead_strip -Wl,-pie "$@" EOF chmod +x $distdir/helper/x86_64-apple-darwin-clang

1 0

[tor-browser-build/master] Bug 31465: Make SDK version explicit in directory
by boklm＠torproject.org 21 Aug '19

21 Aug '19

commit e5c707ff79b3e0191e0c2e1065c5df09cd584895 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Aug 20 11:00:41 2019 +0000 Bug 31465: Make SDK version explicit in directory --- projects/firefox/mozconfig-osx-x86_64 | 2 +- projects/macosx-toolchain/build | 2 +- projects/macosx-toolchain/config | 2 +- projects/rust/build | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/firefox/mozconfig-osx-x86_64 b/projects/firefox/mozconfig-osx-x86_64 index 5d82d12..188bcc9 100644 --- a/projects/firefox/mozconfig-osx-x86_64 +++ b/projects/firefox/mozconfig-osx-x86_64 @@ -4,7 +4,7 @@ TOOLCHAIN_DIR=/var/tmp/dist/macosx-toolchain mk_add_options "export LD_LIBRARY_PATH=$TOOLCHAIN_DIR/clang/lib" CROSS_CCTOOLS_PATH=$TOOLCHAIN_DIR/cctools -CROSS_SYSROOT=$TOOLCHAIN_DIR/SDK +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" diff --git a/projects/macosx-toolchain/build b/projects/macosx-toolchain/build index c9cd282..f306302 100644 --- a/projects/macosx-toolchain/build +++ b/projects/macosx-toolchain/build @@ -3,7 +3,7 @@ distdir="/var/tmp/dist/[% project %]" mkdir -p "$distdir" tar xjf [% c('input_files_by_name/SDK') %] -mv MacOSX10.11.sdk "$distdir/SDK" +mv MacOSX10.11.sdk "$distdir/" tar xf [% c('input_files_by_name/clang') %] mv clang "$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 57e471f..b7d5a39 100644 --- a/projects/macosx-toolchain/config +++ b/projects/macosx-toolchain/config @@ -7,7 +7,7 @@ var: setup: | mkdir -p /var/tmp/dist tar -C /var/tmp/dist -xf $rootdir/[% c("compiler_tarfile") %] - export sysrootdir=/var/tmp/dist/[% project %]/SDK/ + export sysrootdir=/var/tmp/dist/[% project %]/MacOSX10.11.sdk/ export clangdir=/var/tmp/dist/[% project %]/clang export cctoolsdir=/var/tmp/dist/[% project %]/cctools/bin export PATH="$clangdir/bin:$cctoolsdir:$PATH" diff --git a/projects/rust/build b/projects/rust/build index 633604c..599d42e 100644 --- a/projects/rust/build +++ b/projects/rust/build @@ -40,7 +40,7 @@ export PATH="$distdir-rust-old/bin:$PATH" cat > $distdir/helper/x86_64-apple-darwin-clang << 'EOF' #!/bin/sh BASEDIR=/var/tmp/dist/macosx-toolchain -$BASEDIR/cctools/bin/x86_64-apple-darwin-clang -target x86_64-apple-darwin -B $BASEDIR/cctools/bin -isysroot $BASEDIR/SDK/ -Wl,-syslibroot,$BASEDIR/SDK/ -Wl,-dead_strip -Wl,-pie "$@" +$BASEDIR/cctools/bin/x86_64-apple-darwin-clang -target x86_64-apple-darwin -B $BASEDIR/cctools/bin -isysroot $BASEDIR/MacOSX10.11.sdk/ -Wl,-syslibroot,$BASEDIR/MacOSX10.11.sdk/ -Wl,-dead_strip -Wl,-pie "$@" EOF chmod +x $distdir/helper/x86_64-apple-darwin-clang

1 0

[tor-browser-build/master] Bug 31465: Bump Go to 1.12.9
by boklm＠torproject.org 21 Aug '19

21 Aug '19

commit e9ff8677a5ab59325bcf435fa92e06ba73d67f2f Author: Georg Koppen <gk(a)torproject.org> Date: Tue Aug 20 08:17:15 2019 +0000 Bug 31465: Bump Go to 1.12.9 This is not only a fix for macOS notarization related issues but picks up security fixes as well (see: #31456). --- projects/go/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/go/config b/projects/go/config index c2baeca..fd96bb6 100644 --- a/projects/go/config +++ b/projects/go/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.12.5 +version: 1.12.9 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: @@ -91,7 +91,7 @@ input_files: enable: '[% c("var/windows") || c("var/osx") %]' - URL: 'https://golang.org/dl/go[% c("version") %].src.tar.gz' name: go - sha256sum: 2aa5f088cbb332e73fc3def546800616b38d3bfe6b8713b8a6404060f22503e8 + sha256sum: ab0e56ed9c4732a653ed22e232652709afbf573e710f56a07f7fdeca578d62fc - URL: 'https://golang.org/dl/go[% c("var/go14_version") %].src.tar.gz' name: go14 sha256sum: 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959

1 0

[tor-browser-build/master] Bug 30323: Adapt macOS toolchain for esr68
by boklm＠torproject.org 21 Aug '19

21 Aug '19

commit 1877dbbdf499e51beb6dd5be2d53e74f57428130 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Aug 19 18:18:22 2019 +0000 Bug 30323: Adapt macOS toolchain for esr68 There are already included some simplifications as done in https://bugzilla.mozilla.org/show_bug.cgi?id=1513798 but not all of them as some break our current setup. This needs to get investigated in a different bug. --- projects/firefox/build | 48 +++++++++++++++-------------------- projects/firefox/config | 1 - projects/firefox/mozconfig-osx-x86_64 | 15 +++++------ projects/macosx-toolchain/build | 7 ++--- projects/macosx-toolchain/config | 4 +-- 5 files changed, 31 insertions(+), 44 deletions(-) diff --git a/projects/firefox/build b/projects/firefox/build index 18db7b9..5d4d2a3 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -52,24 +52,23 @@ EOF wine wineboot -i [% END -%] +mkdir -p /var/tmp/dist +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') %] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/python') %] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/node') %] +export PATH="/var/tmp/dist/rust/bin:/var/tmp/dist/cbindgen:/var/tmp/dist/nasm/bin:/var/tmp/dist/python/bin:/var/tmp/dist/node/bin:$PATH" +tar -C /var/tmp/dist -xf [% c('input_files_by_name/clang') %] +export LLVM_CONFIG="/var/tmp/dist/clang/bin/llvm-config" + [% IF c("var/linux") %] - mkdir -p /var/tmp/dist tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/binutils') %] - tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/python') %] - tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/node') %] - export PATH="/var/tmp/dist/binutils/bin:/var/tmp/dist/python/bin:/var/tmp/dist/node/bin:$PATH" + export PATH="/var/tmp/dist/binutils/bin:$PATH" # Use clang for everything on Linux now. - tar -C /var/tmp/dist -xf [% c('input_files_by_name/clang') %] - export LLVM_CONFIG="/var/tmp/dist/clang/bin/llvm-config" export PATH="/var/tmp/dist/clang/bin:$PATH" [% END -%] -mkdir -p /var/tmp/dist -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') %] -export PATH="/var/tmp/dist/rust/bin:/var/tmp/dist/cbindgen:/var/tmp/dist/nasm/bin:$PATH" - tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz [% IF c("var/osx") %] @@ -226,27 +225,22 @@ cp -p config/createprecomplete.py $MARTOOLS/ cp -p tools/update-packaging/*.sh $MARTOOLS/ cp -p obj-*/dist/host/bin/mar $MARTOOLS/ cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/ -[% IF c("var/linux") %] +[% IF c("var/linux") || c("var/osx") %] cp -p obj-*/dist/bin/signmar $MARTOOLS/ cp -p obj-*/dist/bin/certutil $MARTOOLS/ cp -p obj-*/dist/bin/modutil $MARTOOLS/ cp -p obj-*/dist/bin/pk12util $MARTOOLS/ cp -p obj-*/dist/bin/shlibsign $MARTOOLS/ - NSS_LIBS="libfreeblpriv3.so libmozsqlite3.so libnss3.so libnssckbi.so libnssdbm3.so libnssutil3.so libsmime3.so libsoftokn3.so libssl3.so" - NSPR_LIBS="libnspr4.so libplc4.so libplds4.so" + [% IF c("var/linux") %] + NSS_LIBS="libfreeblpriv3.so libmozsqlite3.so libnss3.so libnssckbi.so libnssdbm3.so libnssutil3.so libsmime3.so libsoftokn3.so libssl3.so" + NSPR_LIBS="libnspr4.so libplc4.so libplds4.so" + [% ELSE %] + NSS_LIBS="libfreebl3.dylib libmozglue.dylib libnss3.dylib libnssckbi.dylib libnssdbm3.dylib libsoftokn3.dylib" + # No NSPR_LIBS for macOS + NSPR_LIBS="" + [% END %] for LIB in $NSS_LIBS $NSPR_LIBS; do - cp -p obj-*/dist/bin/$LIB $MARTOOLS/ - done -[% END %] -[% IF c("var/osx") %] - cp -p obj-*/modules/libmar/tool/signmar $MARTOOLS/ - cp -p obj-*/security/nss/cmd/certutil/certutil_certutil/certutil $MARTOOLS/ - cp -p obj-*/security/nss/cmd/modutil/modutil_modutil/modutil $MARTOOLS/ - cp -p obj-*/security/nss/cmd/pk12util/pk12util_pk12util/pk12util $MARTOOLS/ - cp -p obj-*/security/nss/cmd/shlibsign/shlibsign_shlibsign/shlibsign $MARTOOLS/ - NSS_LIBS="libfreebl3.dylib libmozglue.dylib libnss3.dylib libnssckbi.dylib libnssdbm3.dylib libsoftokn3.dylib" - for LIB in $NSS_LIBS; do - cp -p obj-*/dist/bin/$LIB $MARTOOLS/ + cp -p obj-*/dist/bin/$LIB $MARTOOLS/ done [% END %] [% IF c("var/windows") %] diff --git a/projects/firefox/config b/projects/firefox/config index a481815..a1073d5 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -152,7 +152,6 @@ input_files: name: python - project: clang name: clang - enable: '[% c("var/linux") %]' - project: fxc2 name: fxc2 enable: '[% c("var/windows") %]' diff --git a/projects/firefox/mozconfig-osx-x86_64 b/projects/firefox/mozconfig-osx-x86_64 index a87bf35..5d82d12 100644 --- a/projects/firefox/mozconfig-osx-x86_64 +++ b/projects/firefox/mozconfig-osx-x86_64 @@ -11,21 +11,18 @@ FLAGS="-target x86_64-apple-darwin11 -B $CROSS_CCTOOLS_PATH/bin -isysroot $CROSS 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 LDFLAGS="-Wl,-syslibroot,$CROSS_SYSROOT -Wl,-pie" export BINDGEN_CFLAGS="$FLAGS" export TOOLCHAIN_PREFIX=$CROSS_CCTOOLS_PATH/bin/x86_64-apple-darwin11- -export DSYMUTIL="$TOOLCHAIN_DIR/clang/bin/llvm-dsymutil" +export DSYMUTIL="$TOOLCHAIN_DIR/clang/bin/dsymutil" -export HOST_CC="$TOOLCHAIN_DIR/clang/bin/clang" -export HOST_CXX="$TOOLCHAIN_DIR/clang/bin/clang++" -export HOST_CPP="$TOOLCHAIN_DIR/clang/bin/clang -E" export HOST_CFLAGS="-g" export HOST_CXXFLAGS="-g" export HOST_LDFLAGS="-g" -ac_add_options --target=x86_64-apple-darwin +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 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-macos @@ -41,14 +38,14 @@ ac_add_options --enable-optimize ac_add_options --disable-debug ac_add_options --enable-tor-browser-data-outside-app-dir -ac_add_options --enable-tor-browser-update +#ac_add_options --enable-tor-browser-update ac_add_options --enable-signmar ac_add_options --enable-verify-mar ac_add_options --disable-crashreporter -ac_add_options --disable-maintenance-service ac_add_options --disable-webrtc ac_add_options --disable-tests # Let's make sure no preference is enabling either Adobe's or Google's CDM. ac_add_options --disable-eme +ac_add_options --enable-proxy-bypass-protection # ac_add_options --disable-ctypes diff --git a/projects/macosx-toolchain/build b/projects/macosx-toolchain/build index d1d8c34..c9cd282 100644 --- a/projects/macosx-toolchain/build +++ b/projects/macosx-toolchain/build @@ -4,15 +4,12 @@ distdir="/var/tmp/dist/[% project %]" mkdir -p "$distdir" 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 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++ -# "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 8502f57..57e471f 100644 --- a/projects/macosx-toolchain/config +++ b/projects/macosx-toolchain/config @@ -17,8 +17,8 @@ var: input_files: - project: container-image - - name: llvm - project: llvm + - name: clang + project: clang - name: cctools project: cctools - name: SDK

1 0

[tor-browser-build/master] Bump tor-browser branch to pick up latest changes from #30429
by gk＠torproject.org 19 Aug '19

19 Aug '19

commit 4792ed5246d389caad036290e9ed34ff0ae1f0ad Author: Georg Koppen <gk(a)torproject.org> Date: Mon Aug 19 10:04:50 2019 +0000 Bump tor-browser branch to pick up latest changes from #30429 --- projects/firefox/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/firefox/config b/projects/firefox/config index ef0fa83..a481815 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -49,7 +49,7 @@ targets: branding_directory: '[% IF c("var/android") %]mobile/android[% ELSE %]browser[% END %]/branding/official' nightly: - git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1' + git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2' tag_gpg_id: 0 var: torbrowser_update_channel: default

1 0

[tor-browser-build/master] Bump snowflake to cd650fa009
by gk＠torproject.org 19 Aug '19

19 Aug '19

commit 4f475bc94a0237cfb8c932f21d9c7770ea5d0501 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Wed Aug 14 20:22:53 2019 +0000 Bump snowflake to cd650fa009 Closes bug 31403. --- projects/snowflake/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/snowflake/config b/projects/snowflake/config index 2165f80..468b704 100644 --- a/projects/snowflake/config +++ b/projects/snowflake/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://git.torproject.org/pluggable-transports/snowflake.git -git_hash: d11e55aabe3753dbddca18ae084c80ad09e282d3 +git_hash: cd650fa0097f948b15dddd889ad2e6908b58bd66 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var:

1 0