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

[tor-browser-build/master] Bug 34011: Bump clang to 9.0.1
by sysrqb＠torproject.org 16 Jul '20

16 Jul '20

commit 1555bfb9d7dafa42c18ef04c0763c884f4862f22 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jun 11 09:54:09 2020 +0000 Bug 34011: Bump clang to 9.0.1 We add a new project to not interfere with non-mobile toolchain requirements for now until both series are moved to the non-ESR release train. --- projects/fenix-clang/43909.patch | 252 +++++++++++++++++++++++++++++++++++++++ projects/fenix-clang/build | 45 +++++++ projects/fenix-clang/config | 36 ++++++ 3 files changed, 333 insertions(+) diff --git a/projects/fenix-clang/43909.patch b/projects/fenix-clang/43909.patch new file mode 100644 index 0000000..78d2a75 --- /dev/null +++ b/projects/fenix-clang/43909.patch @@ -0,0 +1,252 @@ +From c95310f2d4fd3c88241c3b5d6dbf6251d34a3256 Mon Sep 17 00:00:00 2001 +From: Nikita Popov <nikita.ppv(a)gmail.com> +Date: Sat, 16 Nov 2019 16:22:18 +0100 +Subject: [PATCH] Restructure caching + +Variant on D70103. The caching is switched to always use a BB to +cache entry map, which then contains per-value caches. A separate +set contains value handles with a deletion callback. This allows us +to properly invalidate overdefined values. + +A possible alternative would be to always cache by value first and +have per-BB maps/sets in the each cache entry. In that case we could +use a ValueMap and would avoid the separate value handle set. I went +with the BB indexing at the top level to make it easier to integrate +D69914, but possibly that's not the right choice. + +Differential Revision: https://reviews.llvm.org/D70376 + +diff --git a/llvm/lib/Analysis/LazyValueInfo.cpp b/llvm/lib/Analysis/LazyValueInfo.cpp +index 110c085d3f3..aa6862cb588 100644 +--- a/llvm/lib/Analysis/LazyValueInfo.cpp ++++ b/llvm/lib/Analysis/LazyValueInfo.cpp +@@ -133,12 +133,9 @@ namespace { + /// A callback value handle updates the cache when values are erased. + class LazyValueInfoCache; + struct LVIValueHandle final : public CallbackVH { +- // Needs to access getValPtr(), which is protected. +- friend struct DenseMapInfo<LVIValueHandle>; +- + LazyValueInfoCache *Parent; + +- LVIValueHandle(Value *V, LazyValueInfoCache *P) ++ LVIValueHandle(Value *V, LazyValueInfoCache *P = nullptr) + : CallbackVH(V), Parent(P) { } + + void deleted() override; +@@ -152,89 +149,63 @@ namespace { + /// This is the cache kept by LazyValueInfo which + /// maintains information about queries across the clients' queries. + class LazyValueInfoCache { +- /// This is all of the cached block information for exactly one Value*. +- /// The entries are sorted by the BasicBlock* of the +- /// entries, allowing us to do a lookup with a binary search. +- /// Over-defined lattice values are recorded in OverDefinedCache to reduce +- /// memory overhead. +- struct ValueCacheEntryTy { +- ValueCacheEntryTy(Value *V, LazyValueInfoCache *P) : Handle(V, P) {} +- LVIValueHandle Handle; +- SmallDenseMap<PoisoningVH<BasicBlock>, ValueLatticeElement, 4> BlockVals; ++ /// This is all of the cached information for one basic block. It contains ++ /// the per-value lattice elements, as well as a separate set for ++ /// overdefined values to reduce memory usage. ++ struct BlockCacheEntryTy { ++ SmallDenseMap<AssertingVH<Value>, ValueLatticeElement, 4> LatticeElements; ++ SmallDenseSet<AssertingVH<Value>, 4> OverDefined; + }; + +- /// This tracks, on a per-block basis, the set of values that are +- /// over-defined at the end of that block. +- typedef DenseMap<PoisoningVH<BasicBlock>, SmallPtrSet<Value *, 4>> +- OverDefinedCacheTy; +- /// Keep track of all blocks that we have ever seen, so we +- /// don't spend time removing unused blocks from our caches. +- DenseSet<PoisoningVH<BasicBlock> > SeenBlocks; +- +- /// This is all of the cached information for all values, +- /// mapped from Value* to key information. +- DenseMap<Value *, std::unique_ptr<ValueCacheEntryTy>> ValueCache; +- OverDefinedCacheTy OverDefinedCache; +- ++ /// Cached information per basic block. ++ DenseMap<PoisoningVH<BasicBlock>, BlockCacheEntryTy> BlockCache; ++ /// Set of value handles used to erase values from the cache on deletion. ++ DenseSet<LVIValueHandle, DenseMapInfo<Value *>> ValueHandles; + + public: + void insertResult(Value *Val, BasicBlock *BB, + const ValueLatticeElement &Result) { +- SeenBlocks.insert(BB); +- ++ auto &CacheEntry = BlockCache.try_emplace(BB).first->second; + // Insert over-defined values into their own cache to reduce memory + // overhead. + if (Result.isOverdefined()) +- OverDefinedCache[BB].insert(Val); +- else { +- auto It = ValueCache.find_as(Val); +- if (It == ValueCache.end()) { +- ValueCache[Val] = make_unique<ValueCacheEntryTy>(Val, this); +- It = ValueCache.find_as(Val); +- assert(It != ValueCache.end() && "Val was just added to the map!"); +- } +- It->second->BlockVals[BB] = Result; +- } +- } +- +- bool isOverdefined(Value *V, BasicBlock *BB) const { +- auto ODI = OverDefinedCache.find(BB); +- +- if (ODI == OverDefinedCache.end()) +- return false; ++ CacheEntry.OverDefined.insert(Val); ++ else ++ CacheEntry.LatticeElements.insert({ Val, Result }); + +- return ODI->second.count(V); ++ auto HandleIt = ValueHandles.find_as(Val); ++ if (HandleIt == ValueHandles.end()) ++ ValueHandles.insert({ Val, this }); + } + + bool hasCachedValueInfo(Value *V, BasicBlock *BB) const { +- if (isOverdefined(V, BB)) +- return true; +- +- auto I = ValueCache.find_as(V); +- if (I == ValueCache.end()) ++ auto It = BlockCache.find(BB); ++ if (It == BlockCache.end()) + return false; + +- return I->second->BlockVals.count(BB); ++ return It->second.OverDefined.count(V) || ++ It->second.LatticeElements.count(V); + } + + ValueLatticeElement getCachedValueInfo(Value *V, BasicBlock *BB) const { +- if (isOverdefined(V, BB)) ++ auto It = BlockCache.find(BB); ++ if (It == BlockCache.end()) ++ return ValueLatticeElement(); ++ ++ if (It->second.OverDefined.count(V)) + return ValueLatticeElement::getOverdefined(); + +- auto I = ValueCache.find_as(V); +- if (I == ValueCache.end()) ++ auto LatticeIt = It->second.LatticeElements.find(V); ++ if (LatticeIt == It->second.LatticeElements.end()) + return ValueLatticeElement(); +- auto BBI = I->second->BlockVals.find(BB); +- if (BBI == I->second->BlockVals.end()) +- return ValueLatticeElement(); +- return BBI->second; ++ ++ return LatticeIt->second; + } + + /// clear - Empty the cache. + void clear() { +- SeenBlocks.clear(); +- ValueCache.clear(); +- OverDefinedCache.clear(); ++ BlockCache.clear(); ++ ValueHandles.clear(); + } + + /// Inform the cache that a given value has been deleted. +@@ -248,23 +219,18 @@ namespace { + /// OldSucc might have (unless also overdefined in NewSucc). This just + /// flushes elements from the cache and does not add any. + void threadEdgeImpl(BasicBlock *OldSucc,BasicBlock *NewSucc); +- +- friend struct LVIValueHandle; + }; + } + + void LazyValueInfoCache::eraseValue(Value *V) { +- for (auto I = OverDefinedCache.begin(), E = OverDefinedCache.end(); I != E;) { +- // Copy and increment the iterator immediately so we can erase behind +- // ourselves. +- auto Iter = I++; +- SmallPtrSetImpl<Value *> &ValueSet = Iter->second; +- ValueSet.erase(V); +- if (ValueSet.empty()) +- OverDefinedCache.erase(Iter); ++ for (auto &Pair : BlockCache) { ++ Pair.second.LatticeElements.erase(V); ++ Pair.second.OverDefined.erase(V); + } + +- ValueCache.erase(V); ++ auto HandleIt = ValueHandles.find_as(V); ++ if (HandleIt != ValueHandles.end()) ++ ValueHandles.erase(HandleIt); + } + + void LVIValueHandle::deleted() { +@@ -274,18 +240,7 @@ void LVIValueHandle::deleted() { + } + + void LazyValueInfoCache::eraseBlock(BasicBlock *BB) { +- // Shortcut if we have never seen this block. +- DenseSet<PoisoningVH<BasicBlock> >::iterator I = SeenBlocks.find(BB); +- if (I == SeenBlocks.end()) +- return; +- SeenBlocks.erase(I); +- +- auto ODI = OverDefinedCache.find(BB); +- if (ODI != OverDefinedCache.end()) +- OverDefinedCache.erase(ODI); +- +- for (auto &I : ValueCache) +- I.second->BlockVals.erase(BB); ++ BlockCache.erase(BB); + } + + void LazyValueInfoCache::threadEdgeImpl(BasicBlock *OldSucc, +@@ -303,10 +258,11 @@ void LazyValueInfoCache::threadEdgeImpl(BasicBlock *OldSucc, + std::vector<BasicBlock*> worklist; + worklist.push_back(OldSucc); + +- auto I = OverDefinedCache.find(OldSucc); +- if (I == OverDefinedCache.end()) ++ auto I = BlockCache.find(OldSucc); ++ if (I == BlockCache.end() || I->second.OverDefined.empty()) + return; // Nothing to process here. +- SmallVector<Value *, 4> ValsToClear(I->second.begin(), I->second.end()); ++ SmallVector<Value *, 4> ValsToClear(I->second.OverDefined.begin(), ++ I->second.OverDefined.end()); + + // Use a worklist to perform a depth-first search of OldSucc's successors. + // NOTE: We do not need a visited list since any blocks we have already +@@ -320,10 +276,10 @@ void LazyValueInfoCache::threadEdgeImpl(BasicBlock *OldSucc, + if (ToUpdate == NewSucc) continue; + + // If a value was marked overdefined in OldSucc, and is here too... +- auto OI = OverDefinedCache.find(ToUpdate); +- if (OI == OverDefinedCache.end()) ++ auto OI = BlockCache.find(ToUpdate); ++ if (OI == BlockCache.end() || OI->second.OverDefined.empty()) + continue; +- SmallPtrSetImpl<Value *> &ValueSet = OI->second; ++ auto &ValueSet = OI->second.OverDefined; + + bool changed = false; + for (Value *V : ValsToClear) { +@@ -333,11 +289,6 @@ void LazyValueInfoCache::threadEdgeImpl(BasicBlock *OldSucc, + // If we removed anything, then we potentially need to update + // blocks successors too. + changed = true; +- +- if (ValueSet.empty()) { +- OverDefinedCache.erase(OI); +- break; +- } + } + + if (!changed) continue; +-- +2.24.0 + diff --git a/projects/fenix-clang/build b/projects/fenix-clang/build new file mode 100644 index 0000000..c8cceb4 --- /dev/null +++ b/projects/fenix-clang/build @@ -0,0 +1,45 @@ +#!/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/cmake') %] +export PATH="/var/tmp/dist/cmake/bin:$PATH" +[% 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 +[% END -%] +mkdir -p /var/tmp/build +cd /var/tmp/build +tar -xf $rootdir/[% c('input_files_by_name/llvm') %] +tar -xf $rootdir/[% c('input_files_by_name/clang') %] +tar -xf $rootdir/[% c('input_files_by_name/libcxx') %] +tar -xf $rootdir/[% c('input_files_by_name/libcxxabi') %] +tar -xf $rootdir/[% c('input_files_by_name/lld') %] +tar -xf $rootdir/[% c('input_files_by_name/compiler-rt') %] +mv llvm-* llvm +# LLVM has reproducibility issues when optimizing bitcode, which we need to +# patch. See: #32053 for more details. +patch -p1 < $rootdir/43909.patch +mv clang-* llvm/tools/clang +mv libcxx-* llvm/projects/libcxx +mv libcxxabi-* llvm/projects/libcxxabi +mv lld-* llvm/tools/lld +mv compiler-rt-* llvm/projects/compiler-rt +cd llvm +export LLVM_HOME=$(pwd) +mkdir build +cd build +cmake .. -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=$distdir \ + -DCMAKE_BUILD_TYPE:STRING=Release \ + [% IF c("var/rlbox") -%]-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly \[% END -%] + $LLVM_HOME +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-clang/config b/projects/fenix-clang/config new file mode 100644 index 0000000..8f16354 --- /dev/null +++ b/projects/fenix-clang/config @@ -0,0 +1,36 @@ +# vim: filetype=yaml sw=2 +version: 9.0.1 +filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' +gpg_keyring: clang.gpg +sig_ext: sig + +var: + container: + use_container: 1 + +input_files: + - project: container-image + - name: '[% c("var/compiler") %]' + project: '[% c("var/compiler") %]' + enable: '[% c("var/linux") %]' + - project: cmake + name: cmake + - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("version") %]/llvm-[% c("version") %].src.tar.xz' + name: llvm + file_gpg_id: 1 + - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("version") %]/clang-[% c("version") %].src.tar.xz' + name: clang + file_gpg_id: 1 + - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("version") %]/libcxx-[% c("version") %].src.tar.xz' + name: libcxx + file_gpg_id: 1 + - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("version") %]/libcxxabi-[% c("version") %].src.tar.xz' + name: libcxxabi + file_gpg_id: 1 + - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("version") %]/lld-[% c("version") %].src.tar.xz' + name: lld + file_gpg_id: 1 + - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("version") %]/compiler-rt-[% c("version") %].src.tar.xz' + name: compiler-rt + file_gpg_id: 1 + - filename: 43909.patch

1 0

[tor-browser-build/master] Bug 34012: Bump cbindgen to 0.14.3
by sysrqb＠torproject.org 16 Jul '20

16 Jul '20

commit afde138413480325be06b290b652397e85cdff5a Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jun 11 10:11:29 2020 +0000 Bug 34012: Bump cbindgen to 0.14.3 We add a new project to not interfere with non-mobile toolchain requirements for now until both series are moved to the non-ESR release train. --- projects/fenix-cbindgen/build | 32 ++++++++++++++++++++++++++++++++ projects/fenix-cbindgen/config | 16 ++++++++++++++++ 2 files changed, 48 insertions(+) diff --git a/projects/fenix-cbindgen/build b/projects/fenix-cbindgen/build new file mode 100644 index 0000000..c63a783 --- /dev/null +++ b/projects/fenix-cbindgen/build @@ -0,0 +1,32 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +distdir=/var/tmp/dist +builddir=/var/tmp/build/[% project %] +mkdir -p $distdir/[% project %] +tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/rust') %] +export PATH="/var/tmp/dist/fenix-rust/bin:$PATH" +mkdir -p /var/tmp/build +tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz + +# Now prepare the offline build +# Move the directory for hardcoding the path in .cargo/config +mv /var/tmp/build/[% project %]-[% c('version') %] $builddir +tar -C $builddir -xjf cbindgen-vendor-[% c('version') %].tar.bz2 +cd $builddir +mkdir .cargo +cat > .cargo/config << 'EOF' +[source.crates-io] +replace-with = "vendored-sources" + +[source.vendored-sources] +directory = "/var/tmp/build/fenix-cbindgen/vendor" +EOF + +cargo build --release --frozen --target x86_64-unknown-linux-gnu +mv target/x86_64-unknown-linux-gnu/release/cbindgen $distdir/[% project %] + +cd $distdir +[% c('tar', { + tar_src => [ project ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/fenix-cbindgen/config b/projects/fenix-cbindgen/config new file mode 100644 index 0000000..c081451 --- /dev/null +++ b/projects/fenix-cbindgen/config @@ -0,0 +1,16 @@ +# vim: filetype=yaml sw=2 +version: 0.14.3 +git_url: https://github.com/eqrion/cbindgen +git_hash: cc2876f709808a52d132a5f84e53ca1964eb92db # v0.14.3 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +var: + container: + use_container: 1 +input_files: + - project: container-image + - name: rust + project: fenix-rust + # `cargo vendor vendor` in the `cbindgen` directory has vendored the sources. + - URL: https://people.torproject.org/~gk/mirrors/sources/cbindgen-vendor-[% c('version') %].tar.bz2 + sha256sum: cc47db55a1c937e7bcd1cbd8664964656a4922bc35175d95c4015d452f2dcb2b

1 0

[tor-browser-build/master] Bug 33557: Update Android toolchain for Fenix
by sysrqb＠torproject.org 16 Jul '20

16 Jul '20

commit 983cb3322d6b99521aef714babfcaaadac511eab Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jun 11 09:25:16 2020 +0000 Bug 33557: Update Android toolchain for Fenix Based on a patch by sisbell, thanks! We add a new project to not interfere with Fennec toolchain requirements for now until we stop building Fennec-based Tor Browser for Android. --- projects/fenix-android-toolchain/build | 72 +++++++++++++++++++++++++++++++++ projects/fenix-android-toolchain/config | 70 ++++++++++++++++++++++++++++++++ 2 files changed, 142 insertions(+) diff --git a/projects/fenix-android-toolchain/build b/projects/fenix-android-toolchain/build new file mode 100644 index 0000000..1135ed4 --- /dev/null +++ b/projects/fenix-android-toolchain/build @@ -0,0 +1,72 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +export PROJECT_PATH=/var/tmp/dist/[% project %] +export SDK_HOME=$PROJECT_PATH/android-sdk-linux +export NDK_HOME=$PROJECT_PATH/android-ndk +export GRADLE_HOME=$PROJECT_PATH/gradle +android_release_dir=android-10 +android_release_dir_old=android-9 + +# Make directories +mkdir -p $NDK_HOME $SDK_HOME $GRADLE_HOME + +# Compiler Archives +unzip -qq [% c("input_files_by_name/android_sdk_tools") %] -d $SDK_HOME +unzip -qq [% c("input_files_by_name/android_ndk_compiler")%] -d $NDK_HOME +# GeckoView is still using an older Android NDK, bundle it, too. +unzip -qq [% c("input_files_by_name/android_ndk_compiler_old")%] -d $NDK_HOME +unzip -qq [% c("input_files_by_name/gradle_bin") %] -d $GRADLE_HOME +# GeckoView is still using an older Gradle, bundle it, too. +unzip -qq [% c("input_files_by_name/gradle_bin_old") %] -d $GRADLE_HOME +# application-services is using a comparatively new Gradle, bundle it, too. +unzip -qq [% c("input_files_by_name/gradle_bin_new") %] -d $GRADLE_HOME + +# NDK Archive +for version in [% c("var/android_ndk_version") %][% c("var/android_ndk_revision") %] [% c("var/android_ndk_version_old") %]; do + cd $NDK_HOME + # Adjust cross compilation prefix for armv7a. Unfortunately, the compiler cross + # compilation prefix and the one for all the other tools differ. Let's fix that + # so we only have to take care of one. See: #33557 (comment 2674649). + cd android-ndk-r$version/toolchains/llvm/prebuilt/linux-x86_64/bin + for f in `ls arm-linux-androideabi-*`; do + ln -s $f ${f//arm-linux-androideabi/armv7a-linux-androideabi} + done +done + +# Tool Archives +cd $SDK_HOME +unzip -qq $HOME/[% c("input_files_by_name/build_tools") %] -d $SDK_HOME +mkdir -p build-tools/[% c("version") %] +mv $android_release_dir/* build-tools/[% c("version") %] + +# Fenix has not updated to build-tools 29 yet, bundle therefore build-tools 28, +# too. +unzip -qq $HOME/[% c("input_files_by_name/build_tools_old") %] -d $SDK_HOME +mkdir -p build-tools/[% c("version_old") %] +mv $android_release_dir_old/* build-tools/[% c("version_old") %] + +unzip -qq $HOME/[% c("input_files_by_name/platform") %] -d $SDK_HOME +mkdir -p platforms/android-[% c("var/android_api_level") %] +mv $android_release_dir/* platforms/android-[% c("var/android_api_level") %] + +# Fenix has not updated to Android 29 yet, bundle therefore Android 28, too. +unzip -qq $HOME/[% c("input_files_by_name/platform_old") %] -d $SDK_HOME +mkdir -p platforms/android-[% c("var/android_api_level_old") %] +mv $android_release_dir_old/* platforms/android-[% c("var/android_api_level_old") %] + +unzip -qq $HOME/[% c("input_files_by_name/platform_tools") %] -d $SDK_HOME + +# That's a quirk required by GeckoView but let's have it here instead of in the +# project's build script +mkdir emulator +cp tools/emulator emulator/ + +# Cleanup +rm -fR $android_release_dir $android_release_dir_old + +# Archive dist directory +cd /var/tmp/dist +[% c('tar', { + tar_src => [ project ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/fenix-android-toolchain/config b/projects/fenix-android-toolchain/config new file mode 100644 index 0000000..c01ca91 --- /dev/null +++ b/projects/fenix-android-toolchain/config @@ -0,0 +1,70 @@ +# vim: filetype=yaml sw=2 +filename: '[% project %]-[% c("version") %]-[% c("version_old") %]-[% c("var/build_id") %].tar.gz' +version: 29.0.3 +version_old: 28.0.3 +var: + container: + use_container: 1 + deps: + - unzip + - python + setup: | + mkdir -p /var/tmp/dist + tar -C /var/tmp/dist -xf $rootdir/[% c("compiler_tarfile") %] + export ANDROID_SDK_HOME=/var/tmp/dist/[% project %]/android-sdk-linux + # By default we use the old NDK which is the one GeckoView is using. + # However, we can overwrite that per project if needed (e.g. + # application-services is currently on a newer NDK). + export ANDROID_NDK_HOME=/var/tmp/dist/[% project %]/android-ndk/android-ndk-r[% c("var/android_ndk_version_old") %] + export GRADLE_HOME=/var/tmp/dist/[% project %]/gradle + export ANDROID_HOME=$ANDROID_SDK_HOME + export GRADLE_USER_HOME=$GRADLE_HOME + export PATH=$PATH:$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin:$GRADLE_HOME/gradle-[% c("var/gradle_version") %]/bin + google_repo: https://dl.google.com/android/repository + android_api_level: 29 + android_api_level_old: 28 + android_platform_revision: 04 + android_ndk_version: 21 + android_ndk_version_old: 20 + android_ndk_revision: d + gradle_version_new: 6.3 + gradle_version: 5.6.4 + gradle_version_old: 5.1.1 +input_files: + - project: container-image + - URL: '[% c("var/google_repo") %]/build-tools_r[% c("version") %]-linux.zip' + name: build_tools + sha256sum: 5652d8cd5eaaade0b853bfe0ae6cbfa0706a6f70a0ebb25ca24a6f484ec3d855 + - URL: '[% c("var/google_repo") %]/build-tools_r[% c("version_old") %]-linux.zip' + name: build_tools_old + sha256sum: 7954956a40633c88f693d638cbc23f68e9e2499dc7a4b7dfdaf6a3e91387749a + - URL: '[% c("var/google_repo") %]/platform-[% c("var/android_api_level") %]_r[% c("var/android_platform_revision") %].zip' + name: platform + sha256sum: c9eaf2ce4e8fa6f5a8036bd3c95363d003733bf0a1bd349718cadf802db44c69 + - URL: '[% c("var/google_repo") %]/platform-[% c("var/android_api_level_old") %]_r[% c("var/android_platform_revision") %].zip' + name: platform_old + sha256sum: 967f8ca99b71d337aa9c7781f9d65dd8110bf5c4746f44304047bf71b20d0ded + # ./mach bootstrap is fetching the latest version, so it does not seem to + # matter which particular version we are using. Pin to the one fitting best to + # SDK version/build-tools version. + - URL: '[% c("var/google_repo") %]/platform-tools_r[% c("version") %]-linux.zip' + name: platform_tools + sha256sum: 49e676ec90bff1f7d7dfe4fb7d0ab78e14fa8fb06a8dccca2ef57a1bc29497a0 + - URL: '[% c("var/google_repo") %]/sdk-tools-linux-4333796.zip' + name: android_sdk_tools + sha256sum: 92ffee5a1d98d856634e8b71132e8a95d96c83a63fde1099be3d86df3106def9 + - URL: '[% c("var/google_repo") %]/android-ndk-r[% c("var/android_ndk_version") %][% c("var/android_ndk_revision") %]-linux-x86_64.zip' + name: android_ndk_compiler + sha256sum: dd6dc090b6e2580206c64bcee499bc16509a5d017c6952dcd2bed9072af67cbd + - URL: '[% c("var/google_repo") %]/android-ndk-r[% c("var/android_ndk_version_old") %]-linux-x86_64.zip' + name: android_ndk_compiler_old + sha256sum: 57435158f109162f41f2f43d5563d2164e4d5d0364783a9a6fab3ef12cb06ce0 + - URL: https://services.gradle.org/distributions/gradle-[% c("var/gradle_version_new") %]-bin.zip + name: gradle_bin_new + sha256sum: 038794feef1f4745c6347107b6726279d1c824f3fc634b60f86ace1e9fbd1768 + - URL: https://services.gradle.org/distributions/gradle-[% c("var/gradle_version") %]-bin.zip + name: gradle_bin + sha256sum: 1f3067073041bc44554d0efe5d402a33bc3d3c93cc39ab684f308586d732a80d + - URL: https://services.gradle.org/distributions/gradle-[% c("var/gradle_version_old") %]-bin.zip + name: gradle_bin_old + sha256sum: 4953323605c5d7b89e97d0dc7779e275bccedefcdac090aec123375eae0cc798

1 0

[tor-browser-build/master] Bug 34013: Bump Node to v10.21.0
by sysrqb＠torproject.org 16 Jul '20

16 Jul '20

commit 15a7d9551bf4c6048caa659d74a689c5dfbe2d4b Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jun 11 10:14:56 2020 +0000 Bug 34013: Bump Node to v10.21.0 We add a new project to not interfere with non-mobile toolchain requirements for now until both series are moved to the non-ESR release train. --- projects/fenix-node/build | 24 ++++++++++++++++++++++++ projects/fenix-node/config | 18 ++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/projects/fenix-node/build b/projects/fenix-node/build new file mode 100644 index 0000000..8cc8ea5 --- /dev/null +++ b/projects/fenix-node/build @@ -0,0 +1,24 @@ +#!/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 new file mode 100644 index 0000000..b3534f4 --- /dev/null +++ b/projects/fenix-node/config @@ -0,0 +1,18 @@ +# 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

1 0

[tor-browser-build/master] Bug 34014: Enable sqlite3 support in Python
by sysrqb＠torproject.org 16 Jul '20

16 Jul '20

commit 49ebf71c779e8af289a3377b4698c79d70872123 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Apr 22 15:20:56 2020 +0000 Bug 34014: Enable sqlite3 support in Python --- projects/python/config | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/python/config b/projects/python/config index 10c79cc..a5caece 100644 --- a/projects/python/config +++ b/projects/python/config @@ -10,6 +10,7 @@ var: - python-all - zlib1g-dev - libssl-dev + - libsqlite3-dev setup: | mkdir -p /var/tmp/dist

1 0

[tor-browser-build/master] Bug 33801: Upgrade Go Project to use new Android Toolchain
by sysrqb＠torproject.org 16 Jul '20

16 Jul '20

commit 420d7fedac209b4a9c53ecde5e4ecda49b02ee7f Author: sisbell <shane.isbell(a)gmail.com> Date: Thu Apr 2 15:40:58 2020 -0700 Bug 33801: Upgrade Go Project to use new Android Toolchain --- projects/go/build | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/projects/go/build b/projects/go/build index 02fba2b..1096549 100644 --- a/projects/go/build +++ b/projects/go/build @@ -68,7 +68,11 @@ cd /var/tmp/dist/go/src CGO_ENABLED=1 CC_FOR_TARGET="$CC_FOR_TARGET" CC= CFLAGS= LDFLAGS= ./make.bash [% ELSIF c("var/android") -%] patch -p2 < $rootdir/0001-Use-fixed-go-build-tmp-directory.patch - CGO_ENABLED=1 CC_FOR_TARGET=[% c("var/CC") %] CGO_CFLAGS='-D__ANDROID_API__=[% c("var/android_min_api") %]' CC= CFLAGS= LDFLAGS= ./make.bash + [% IF c("var/android-fenix") -%] + CGO_ENABLED=1 CC_FOR_TARGET=[% c("var/CC") %] CC= CFLAGS= LDFLAGS= ./make.bash + [% ELSE -%] + CGO_ENABLED=1 CC_FOR_TARGET=[% c("var/CC") %] CGO_CFLAGS='-D__ANDROID_API__=[% c("var/android_min_api") %]' CC= CFLAGS= LDFLAGS= ./make.bash + [% END -%] [% END -%] # This directory is non-reproducible and doesn't exist in official Go releases,

1 0

[tor-browser-build/master] Bug 34187: Update zlib to use Android NDK 20
by sysrqb＠torproject.org 16 Jul '20

16 Jul '20

commit 444771b80e706d047199eae24658acc4d52dd983 Author: Georg Koppen <gk(a)torproject.org> Date: Tue May 12 15:00:16 2020 +0000 Bug 34187: Update zlib to use Android NDK 20 --- projects/zlib/build | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/projects/zlib/build b/projects/zlib/build index 5ee00d5..a60e037 100644 --- a/projects/zlib/build +++ b/projects/zlib/build @@ -11,8 +11,13 @@ cd /var/tmp/build/[% project %]-[% c('version') %] [% END -%] [% IF c("var/android") -%] - export CHOST=[% c("var/configure_host") %] - export CC="clang" + [% IF c("var/android-fenix") -%] + export CHOST=[% c("var/cross_prefix") %] + export CC=[% c("var/CC") %] + [% ELSE -%] + export CHOST=[% c("var/configure_host") %] + export CC="clang" + [% END -%] ./configure --prefix=$distdir make -j[% c("buildconf/num_procs") %] make -j[% c("buildconf/num_procs") %] install

1 0

[tor-browser-build/master] Bug 33564: Upgrade ZSTD to use Android NDK 20
by sysrqb＠torproject.org 16 Jul '20

16 Jul '20

commit caf2a191836a82ca5429a5dbd9b29e7c00746373 Author: sisbell <shane.isbell(a)gmail.com> Date: Mon Mar 30 10:43:05 2020 -0700 Bug 33564: Upgrade ZSTD to use Android NDK 20 --- projects/zstd/build | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/projects/zstd/build b/projects/zstd/build index 3d76a1a..b78d518 100644 --- a/projects/zstd/build +++ b/projects/zstd/build @@ -7,7 +7,11 @@ mkdir -p /var/tmp/build tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %] export CPPFLAGS=-DZSTD_MULTITHREAD -export CC=[% c("var/configure_host") %]-clang +[% IF c("var/android-fenix") -%] + export CC=[% c("var/CC") %] +[% ELSE -%] + export CC=[% c("var/configure_host") %]-clang +[% END -%] make -C lib -j[% c("buildconf/num_procs") %] PREFIX=$distdir install # Only need static libraries rm $distdir/lib/libzstd.so*

1 0

[tor-browser-build/master] Bug 33561: Upgrade OpenSSL to use Android NDK 20
by sysrqb＠torproject.org 16 Jul '20

16 Jul '20

commit ef590817fc328216594f1a634951ae245482d6e9 Author: Georg Koppen <gk(a)torproject.org> Date: Wed May 13 11:31:27 2020 +0000 Bug 33561: Upgrade OpenSSL to use Android NDK 20 --- projects/openssl/build | 2 +- projects/openssl/config | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/openssl/build b/projects/openssl/build index 8ceb952..5f275a0 100644 --- a/projects/openssl/build +++ b/projects/openssl/build @@ -17,7 +17,7 @@ export CC='gcc -m32' patch -p1 < $rootdir/use-SOURCE_DATE_EPOCH.patch [% END -%] # OpenSSL expects the NDK home to include the pre-assembled architecture directory -[% IF c("var/android") -%] +[% IF c("var/android") && !c("var/android-fenix") -%] export ANDROID_NDK_HOME=$ANDROID_NDK_HOME/[% c("var/toolchain_arch") %] [% END -%] export SOURCE_DATE_EPOCH='[% c("timestamp") %]' diff --git a/projects/openssl/config b/projects/openssl/config index 7399c0a..ab62b14 100644 --- a/projects/openssl/config +++ b/projects/openssl/config @@ -24,7 +24,7 @@ targets: configure_opts: --cross-compile-prefix=x86_64-apple-darwin11- darwin64-x86_64-cc enable-ec_nistp_64_gcc_128 android: var: - configure_opts: CC=clang android-[% c("var/toolchain_arch") %] -no-shared + 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 %]' input_files: - project: container-image

1 0

[tor-browser-build/master] Bug 33563: Upgrade Tor to use Android NDK 20
by sysrqb＠torproject.org 16 Jul '20

16 Jul '20

commit 56578679ab388a1b06e70ab68c6a89bdaaec0cbb Author: Georg Koppen <gk(a)torproject.org> Date: Fri May 15 11:27:10 2020 +0000 Bug 33563: Upgrade Tor to use Android NDK 20 We remove --libdir as well for the Fenix toolchain as it does nothing (and would be wrongly used anyway if pointing to ANDROID_NDK_HOME). --- projects/tor/build | 6 +++++- projects/tor/config | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/projects/tor/build b/projects/tor/build index 7747549..4345d35 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -148,7 +148,11 @@ cd $distdir [% END %] [% IF c("var/android") %] - install -s --strip-program=[% c("var/configure_host") %]-strip $distdir/bin/tor $libsdir/libTor.so + [% IF c("var/android-fenix") %] + install -s --strip-program=[% c("var/cross_prefix") %]-strip $distdir/bin/tor $libsdir/libTor.so + [% ELSE %] + install -s --strip-program=[% c("var/configure_host") %]-strip $distdir/bin/tor $libsdir/libTor.so + [% END %] [% END %] mkdir -p [% dest_dir _ '/' _ c('filename') %] diff --git a/projects/tor/config b/projects/tor/config index 72d7a8a..8fec5b2 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -47,7 +47,7 @@ targets: flag_mwindows: '' android: var: - configure_opt_project: --libdir=$ANDROID_NDK_HOME/[% c("var/toolchain_arch") %]/lib --enable-android --enable-static-openssl --enable-static-libevent --enable-zstd --disable-tool-name-check --disable-system-torrc --disable-system-torrc + configure_opt_project: '[% IF !c("var/android-fenix") %]--libdir=$ANDROID_NDK_HOME/[% c("var/toolchain_arch") %]/lib [% END %]--enable-android --enable-static-openssl --enable-static-libevent --enable-zstd --disable-tool-name-check --disable-system-torrc --disable-system-torrc' arch_deps: - libtinfo5

1 0