commit eaf75d984a0ceb212d02ff19ba0d54baf81499f1 Merge: 830c87a 098fc5e Author: Matthew Finkel sysrqb@torproject.org Date: Wed Oct 6 22:21:06 2021 +0000
Merge remote-tracking branch 'boklmgl/bug_40336_v2'
...01-Revert-Bug-30318-Add-snowflake-support.patch | 78 ---------------------- projects/tor-android-service/build | 3 - projects/tor-android-service/config | 2 - projects/tor-browser/build | 11 +-- projects/tor-browser/config | 2 +- projects/tor-onion-proxy-library/build | 28 +++----- projects/tor-onion-proxy-library/config | 5 -- rbm.conf | 12 ---- 8 files changed, 11 insertions(+), 130 deletions(-)
diff --cc rbm.conf index d7bbd5f,63105ad..87b2c09 --- a/rbm.conf +++ b/rbm.conf @@@ -445,13 -450,9 +439,10 @@@ targets flag_mwindows: '-mwindows' compiler: mingw-w64 faketime_path: /usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1 - # We only build snowflake on the alpha and nightly - # channels for now. - snowflake: '[% c("var/alpha") || c("var/nightly") %]' deps: - build-essential - - python + - python3 + - python3-distutils - bison - automake - libtool @@@ -472,16 -473,13 +463,13 @@@ 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' + macosx_deployment_target: '10.12' locale_ja: ja-JP-mac - # We only support RLBox on the nightly channel for now - rlbox: '[% c("var/nightly") %]' + rlbox: 0 - # We only build snowflake on the alpha and nightly - # channels for now. - snowflake: '[% c("var/alpha") || c("var/nightly") %]' deps: - build-essential - - python + - python3 + - python3-distutils - automake - libtool - zip
tbb-commits@lists.torproject.org