boklm pushed to branch main at The Tor Project / Applications / tor-browser-build
Commits: 1e4d64eb by Nicolas Vigier at 2022-12-09T11:12:31+01:00 Bug 40681: Run `apt-get clean` after installing packages
- - - - - b3972182 by Nicolas Vigier at 2022-12-09T11:12:33+01:00 Bug 40683: Reduce the number of custom containers
Install a few more packages in the default containers to reduce the number of custom containers we use.
- - - - - ad51122f by Nicolas Vigier at 2022-12-09T11:12:34+01:00 Bug 40689: Update Ubuntu version in projects/mmdebstrap-image to 22.04.1
- - - - - 1c5314b5 by Nicolas Vigier at 2022-12-09T11:12:36+01:00 Bug 40693: Patch apt-key to accept expired keys for jessie
- - - - - 5d387c8f by Nicolas Vigier at 2022-12-09T11:12:38+01:00 Bug 40693: use faketime to run `apt-get update` on jessie
- - - - - 228a1188 by Pier Angelo Vendrame at 2022-12-09T11:12:39+01:00 Bug 40653: Do not build compiler-rt with Clang
Specifying compiler-rt as a project in LLVM is going to be deprecated. It should be compiled with runtimes, instead, or alone, if it will be still allowed.
The only platform in which we were compiling compiler-rt with LLVM was Linux. But Firefox seems not to actually use it, and just use GCC's runtime, instead.
However, we were also compiling compiler-rt for Android in the same project, which prevents to share the artifact with Windows and macOS. So, I have moved it to another project on its own.
- - - - -
23 changed files:
- projects/android-components/config - projects/android-toolchain/config - projects/application-services/config - projects/bison/config - projects/browser/config - projects/clang/build - projects/clang/config - + projects/compiler-rt/build - + projects/compiler-rt/config - projects/container-image/config - projects/fenix/config - projects/geckoview/build - projects/geckoview/config - projects/gradle/config - projects/libevent/config - + projects/mmdebstrap-image/apt-key-allow-expired-key.patch - projects/mmdebstrap-image/config - projects/rust/config - projects/tor-android-service/config - projects/tor-onion-proxy-library/config - projects/tor/config - projects/wasi-sysroot/config - rbm.conf
Changes:
===================================== projects/android-components/config ===================================== @@ -19,8 +19,6 @@ var: gradle_version: 7.0.2 glean_parser: 5.0.1 git_branch: '[% project %]-[% c("var/android_components_version") %]-[% c("var/torbrowser_branch") %]-1' - arch_deps: - - python3-venv
targets: nightly:
===================================== projects/android-toolchain/config ===================================== @@ -8,9 +8,6 @@ var: version_30: 30.0.2 version_29: 29.0.2 version_28: 28.0.3 - deps: - - unzip - - python3 setup: | mkdir -p /var/tmp/dist tar -C /var/tmp/dist -xf $rootdir/[% c("compiler_tarfile") %]
===================================== projects/application-services/config ===================================== @@ -13,8 +13,6 @@ var: gradle_dependencies_version: 9 gradle_version: 6.7.1 glean_parser: 4.0.0 - arch_deps: - - python3-venv
input_files: - project: container-image
===================================== projects/bison/config ===================================== @@ -3,9 +3,6 @@ version: 3.8.2 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' container: use_container: 1 - deps: - - build_essential - - xz-utils
input_files: - URL: https://ftp.gnu.org/gnu/bison/bison-%5B% c("version") %].tar.xz
===================================== projects/browser/config ===================================== @@ -17,12 +17,16 @@ var: - patch
targets: - linux-i686: + linux: var: - mar_osname: linux32 arch_deps: - # Install libc6-i386 to be able to run 32bit mar tools (bug 29812) + # Install libc6-i386 to be able to run 32bit mar tools in linux-i686 + # builds (bug 29812). We don't need it in x86_64 builds, but we + # share the container to reduce space used. - libc6-i386 + linux-i686: + var: + mar_osname: linux32 linux-x86_64: var: mar_osname: linux64
===================================== projects/clang/build ===================================== @@ -3,16 +3,12 @@ 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" +tar -C /var/tmp/dist -xf [% c('input_files_by_name/ninja') %] +export PATH="/var/tmp/dist/ninja:/var/tmp/dist/cmake/bin:$PATH" [% IF c("var/linux") %] [% pc('gcc', 'var/setup', { compiler_tarfile => c('input_files_by_name/gcc'), hardened_gcc => 0 }) %] [% pc('python', 'var/setup', { python_tarfile => c('input_files_by_name/python') }) %] -[% END -%] -[% IF c("var/android") %] - [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] -[% END -%] -[% IF c("var/linux") || c("var/android") -%] tar -C /var/tmp/dist -xf [% c('input_files_by_name/binutils') %] export PATH="/var/tmp/dist/binutils/bin:$PATH" [% END -%] @@ -25,57 +21,15 @@ mkdir build cd build # LLVM_ENABLE_ZLIB solves the "contains a compressed section, but zlib is not available" on lld # LLVM_INSTALL_UTILS allows this LLVM to be used to compile Rust -cmake ../llvm -G "Unix Makefiles" \ +cmake ../llvm -GNinja \ -DCMAKE_INSTALL_PREFIX=$distdir \ -DCMAKE_BUILD_TYPE=Release \ - [% IF c("var/android") || c("var/macos") -%] - -DLLVM_TARGETS_TO_BUILD="X86;ARM;AArch64" \ - [% END -%] - [% IF c("var/rlbox") -%]-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly[% END %] \ - -DLLVM_ENABLE_PROJECTS="clang;clang-tools-extra;compiler-rt;lld" \ + -DLLVM_TARGETS_TO_BUILD="X86;ARM;AArch64[% IF c("var/rlbox") -%];WebAssembly[% END %]" \ + -DLLVM_ENABLE_PROJECTS="clang;lld" \ -DLLVM_ENABLE_ZLIB=ON \ -DLLVM_INSTALL_UTILS=ON \
-make -j[% c("num_procs") %] -make install -cd .. - -[% IF c("var/android") -%] - echo "Compiling compiler-rt (Android only)" - rtdistdir=/var/tmp/build/rtdist - mkdir $rtdistdir - - make_compilerrt () { - mkdir "build-compilerrt-$1" - cd "build-compilerrt-$1" - cmake ../compiler-rt/ -G "Unix Makefiles" \ - -DCMAKE_INSTALL_PREFIX=$rtdistdir \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SYSTEM_NAME=Android \ - -DCMAKE_ANDROID_ARCH_ABI=$1 \ - -DCMAKE_ANDROID_NDK="$ANDROID_NDK_HOME" \ - -DCMAKE_C_FLAGS="$3 -fuse-ld=lld --rtlib=compiler-rt" \ - -DCMAKE_CXX_FLAGS="$3 -fuse-ld=lld --rtlib=compiler-rt" \ - -DCMAKE_EXE_LINKER_FLAGS="-L$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/$2" \ - -DCOMPILER_RT_BUILD_BUILTINS=ON \ - -DCOMPILER_RT_BUILD_LIBFUZZER=OFF \ - -DCOMPILER_RT_BUILD_MEMPROF=OFF \ - -DCOMPILER_RT_BUILD_ORC=OFF \ - -DCOMPILER_RT_BUILD_PROFILE=OFF \ - -DCOMPILER_RT_BUILD_SANITIZERS=OFF \ - -DCOMPILER_RT_BUILD_XRAY=OFF - make -j[% c("num_procs") %] - make install - cd .. - } - - make_compilerrt "armeabi-v7a" "arm-linux-androideabi/lib" "-DARMEABI_V7A" - make_compilerrt "arm64-v8a" "aarch64-linux-android/lib64" - make_compilerrt "x86" "i686-linux-android/lib" - make_compilerrt "x86_64" "x86_64-linux-android/lib64" - - mv $rtdistdir/lib/linux/libclang_rt.builtins-*-android.a $distdir/lib/clang/[% c("var/llvm_version") %]/lib/linux/ -[% END -%] +ninja -j[% c("num_procs") %] -v install
cd /var/tmp/dist [% c('tar', {
===================================== projects/clang/config ===================================== @@ -11,14 +11,16 @@ input_files: - project: container-image - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - enable: '[% c("var/linux") || c("var/android") %]' + enable: '[% c("var/linux") %]' - name: binutils project: binutils - enable: '[% c("var/linux") || c("var/android") %]' + enable: '[% c("var/linux") %]' - project: cmake name: cmake - project: llvm-project name: clang-source + - project: ninja + name: ninja - project: python name: python enable: '[% c("var/linux") %]'
===================================== projects/compiler-rt/build ===================================== @@ -0,0 +1,51 @@ +#!/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') %] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/ninja') %] +export PATH="/var/tmp/dist/ninja:/var/tmp/dist/cmake/bin:$PATH" + +[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] + +tar -C /var/tmp/dist -xf [% c('input_files_by_name/binutils') %] +export PATH="/var/tmp/dist/binutils/bin:$PATH" + +mkdir -p /var/tmp/build +cd /var/tmp/build +tar -xf $rootdir/[% c('input_files_by_name/clang-source') %] +cd clang-source +export LLVM_HOME=$(pwd) +mkdir build +cd build + +installdir=/var/tmp/build/install +mkdir -p $installdir + +cmake ../compiler-rt/ -GNinja \ + -DCMAKE_INSTALL_PREFIX=$installdir \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SYSTEM_NAME=Android \ + -DCMAKE_ANDROID_ARCH_ABI="[% c('var/abi') %]" \ + -DCMAKE_ANDROID_NDK="$ANDROID_NDK_HOME" \ + -DCMAKE_C_FLAGS="-fuse-ld=lld --rtlib=compiler-rt $defines" \ + -DCMAKE_CXX_FLAGS="-fuse-ld=lld --rtlib=compiler-rt $defines" \ + -DCMAKE_EXE_LINKER_FLAGS="-L$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/[% c('var/libdir') %]" \ + -DCOMPILER_RT_BUILD_BUILTINS=ON \ + -DCOMPILER_RT_BUILD_LIBFUZZER=OFF \ + -DCOMPILER_RT_BUILD_MEMPROF=OFF \ + -DCOMPILER_RT_BUILD_ORC=OFF \ + -DCOMPILER_RT_BUILD_PROFILE=OFF \ + -DCOMPILER_RT_BUILD_SANITIZERS=OFF \ + -DCOMPILER_RT_BUILD_XRAY=OFF + +ninja -j[% c("num_procs") %] -v install + +mkdir -p $distdir/lib/clang/[% c("var/llvm_version") %]/lib/linux/ +mv $installdir/lib/linux/libclang_rt.builtins-*-android.a $distdir/lib/clang/[% c("var/llvm_version") %]/lib/linux/ + +cd /var/tmp/dist +[% c('tar', { + tar_src => [ project ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %]
===================================== projects/compiler-rt/config ===================================== @@ -0,0 +1,38 @@ +# vim: filetype=yaml sw=2 +version: '[% c("var/llvm_version") %]' +filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 + +var: + llvm_version: '[% pc("llvm-project", "version") %]' + +targets: + android-armv7: + var: + libdir: 'arm-linux-androideabi/lib' + android-aarch64: + var: + libdir: 'aarch64-linux-android/lib64' + android-x86: + var: + libdir: 'i686-linux-android/lib' + android-x86_64: + var: + libdir: 'x86_64-linux-android/lib64' + +input_files: + - project: container-image + - name: '[% c("var/compiler") %]' + project: '[% c("var/compiler") %]' + - name: binutils + project: binutils + - project: cmake + name: cmake + - project: llvm-project + name: clang-source + - project: ninja + name: ninja + - project: python + name: python + enable: '[% c("var/linux") %]'
===================================== projects/container-image/config ===================================== @@ -37,9 +37,14 @@ pre: | [% IF c("var/linux-cross") -%] dpkg --add-architecture [% c("var/arch_debian") %] [% END -%] + [% IF c("var/container/suite") == "jessie" -%] + # We need to use faketime to run `apt-get update` on jessie, because of + # expired key. See tor-browser-build#40693 + dpkg -i ./libfaketime_0.9.6-3_amd64.deb ./faketime_0.9.6-3_amd64.deb + [% END -%] # Update the package cache again because `pre_pkginst` may change the # package manager configuration. - apt-get update -y -q + [% IF c("var/container/suite") == "jessie" %]faketime '2018-12-24 08:15:42' [% END %]apt-get update -y -q [% END -%] apt-get upgrade -y -q [% @@ -66,6 +71,7 @@ pre: | [% IF pc(c('origin_project'), 'var/post_pkginst', { step => c('origin_step') }) -%] [% pc(c('origin_project'), 'var/post_pkginst', { step => c('origin_step') }) %] [% END -%] + apt-get clean
remote_get: | #!/bin/sh @@ -81,3 +87,9 @@ input_files: - project: mmdebstrap-image target: - '[% c("var/container/suite") %]-[% c("var/container/arch") %]' + - URL: http://deb.debian.org/debian/pool/main/f/faketime/faketime_0.9.6-3_amd64.deb + sha256sum: 19b2a01a2fae7e6d5a8b741fc0bc626451cb4c2cc884ee79f1136dd3c2c26213 + enable: '[% c("var/container/suite") == "jessie" %]' + - URL: http://deb.debian.org/debian/pool/main/f/faketime/libfaketime_0.9.6-3_amd64.... + sha256sum: 82747d5815b226cfed7f6f9a751bf8c20d457f3ba786add6017d6904dea4fdb4 + enable: '[% c("var/container/suite") == "jessie" %]'
===================================== projects/fenix/config ===================================== @@ -20,8 +20,6 @@ var: gradle_dependencies_version: 37 gradle_version: 7.0.2 glean_parser: 5.0.1 - arch_deps: - - python3-venv
targets: release:
===================================== projects/geckoview/build ===================================== @@ -21,6 +21,8 @@ tar -C /var/tmp/dist -xf [% c('input_files_by_name/nasm') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/node') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/clang') %] export LLVM_CONFIG="/var/tmp/dist/clang/bin/llvm-config" +tar -C /var/tmp/dist -xf [% c('input_files_by_name/compiler-rt') %] +cp -r /var/tmp/dist/compiler-rt/* /var/tmp/dist/clang/ tar -C /var/tmp/dist -xf [% c('input_files_by_name/binutils') %] export PATH="/var/tmp/dist/rust/bin:/var/tmp/dist/cbindgen:/var/tmp/dist/nasm/bin:/var/tmp/dist/node/bin:/var/tmp/dist/clang/bin:/var/tmp/dist/binutils/bin:$PATH"
===================================== projects/geckoview/config ===================================== @@ -171,6 +171,8 @@ input_files: name: nasm - project: clang name: clang + - project: 'compiler-rt' + name: 'compiler-rt' - filename: 'gradle-dependencies-[% c("var/gradle_dependencies_version") %]' name: gradle-dependencies exec: '[% INCLUDE "fetch-gradle-dependencies" %]'
===================================== projects/gradle/config ===================================== @@ -5,8 +5,6 @@ container: use_container: 1
var: - deps: - - unzip gradle_sha256sum: 5.1.1: 4953323605c5d7b89e97d0dc7779e275bccedefcdac090aec123375eae0cc798 5.6.4: 1f3067073041bc44554d0efe5d402a33bc3d3c93cc39ab684f308586d732a80d
===================================== projects/libevent/config ===================================== @@ -12,10 +12,6 @@ var: configure_opt_project: --disable-static
targets: - macos: - var: - arch_deps: - - faketime windows: var: configure_opt_project: --disable-shared
===================================== projects/mmdebstrap-image/apt-key-allow-expired-key.patch ===================================== @@ -0,0 +1,23 @@ +--- o/apt-key 2022-11-30 14:57:12.742026261 +0000 ++++ n/apt-key 2022-12-01 08:38:08.170140893 +0000 +@@ -815,11 +815,18 @@ + create_gpg_home + fi + setup_merged_keyring ++ tmpfile=$(mktemp) ++ set +e + if [ -n "$FORCED_KEYRING" ]; then +- "$GPGV" --homedir "${GPGHOMEDIR}" --keyring "$(dearmor_filename "${FORCED_KEYRING}")" --ignore-time-conflict "$@" ++ (eval "exec ${GPGSTATUSFD}>$tmpfile"; "$GPGV" --homedir "${GPGHOMEDIR}" --keyring "$(dearmor_filename "${FORCED_KEYRING}")" --ignore-time-conflict "$@") + else +- "$GPGV" --homedir "${GPGHOMEDIR}" --keyring "${GPGHOMEDIR}/pubring.gpg" --ignore-time-conflict "$@" ++ (eval "exec ${GPGSTATUSFD}>$tmpfile"; "$GPGV" --homedir "${GPGHOMEDIR}" --keyring "${GPGHOMEDIR}/pubring.gpg" --ignore-time-conflict "$@") + fi ++ err=$? ++ set -e ++ cat "$tmpfile" | sed 's/^[GNUPG:] EXPKEYSIG /[GNUPG:] GOODSIG /' >&${GPGSTATUSFD} ++ rm -f "$tmpfile" ++ exit $err + ;; + help) + usage
===================================== projects/mmdebstrap-image/config ===================================== @@ -6,7 +6,7 @@ container: use_container: 1
var: - ubuntu_version: 22.04 + ubuntu_version: 22.04.1
pre: | #!/bin/sh @@ -16,6 +16,14 @@ pre: | apt-get update -y -q apt-get install -y -q debian-archive-keyring ubuntu-keyring mmdebstrap gnupg
+ [% IF c("var/container/suite") == "jessie" -%] + apt-get install -y -q patch + cd /usr/bin + # The gpg key for jessie is expired. We patch apt-key to accept expired keys. + patch -p1 < $rootdir/apt-key-allow-expired-key.patch + cd $rootdir + [% END -%] + export SOURCE_DATE_EPOCH='[% c("timestamp") %]' tar -xf [% c('input_files_by_name/mmdebstrap') %] ./mmdebstrap/mmdebstrap --mode=unshare [% c("var/container/mmdebstrap_opt") %] [% c("var/container/suite") %] output.tar.gz [% c("var/container/debian_mirror") %] @@ -55,4 +63,6 @@ input_files: name: mmdebstrap - URL: 'https://cdimage.ubuntu.com/ubuntu-base/releases/%5B% c("var/ubuntu_version") %]/release/ubuntu-base-[% c("var/ubuntu_version") %]-base-amd64.tar.gz' filename: 'container-image_ubuntu-base-[% c("var/ubuntu_version") %]-base-amd64.tar.gz' - sha256sum: df6fe77cee11bd216ac532f0ee082bdc4da3c0cc1f1d9cb20f3f743196bc4b07 + sha256sum: e1f9200c99da008a473c9ae7b51e13f5ea05dc4c2e12beb43f0f9cbbbf6216f4 + - filename: apt-key-allow-expired-key.patch + enable: '[% c("var/container/suite") == "jessie" %]'
===================================== projects/rust/config ===================================== @@ -7,23 +7,10 @@ container: targets: android: var: - arch_deps: - - libssl-dev - - pkg-config - - zlib1g-dev configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --llvm-root=/var/tmp/dist/clang --set rust.jemalloc --target=x86_64-unknown-linux-gnu,armv7-linux-androideabi,thumbv7neon-linux-androideabi,aarch64-linux-android,i686-linux-android,x86_64-linux-android --set=target.armv7-linux-androideabi.cc=armv7a-linux-androideabi16-clang --set=target.armv7-linux-androideabi.ar=armv7a-linux-androideabi-ar --set=target.thumbv7neon-linux-androideabi.cc=armv7a-linux-androideabi16-clang --set=target.thumbv7neon-linux-androideabi.ar=armv7a-linux-androideabi-ar --set=target.aarch64-linux-android.cc=aarch64-linux-android21-clang --set=target.aarch64-linux-android.ar=aarch64-linux-android-ar --set=target.i686-linux-android.cc=i686-linux-android16-clang --set=target.i686-linux-android.ar=i686-linux-android-ar --set=target.x86_64-linux-android.cc=x86_64-linux-android21-clang --set=target.x86_64-linux-android.ar=x86_64-linux-android-ar
linux: var: - deps: - - libc6-dev-i386 - - lib32stdc++6 - - build-essential - - python - - automake - - libssl-dev - - pkg-config - - hardening-wrapper # We use # `--enable-local-rust` to avoid downloading the required compiler during # build time @@ -58,21 +45,17 @@ targets:
macos: var: + configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --llvm-root=/var/tmp/dist/macosx-toolchain/clang --set rust.jemalloc --target=x86_64-unknown-linux-gnu,[% c("var/build_target") %] --set=target.[% c("var/build_target") %].cc=[% c("var/build_target") %]-clang --set target.x86_64-unknown-linux-gnu.linker=clang --set target.x86_64-unknown-linux-gnu.ar=llvm-ar --set target.x86_64-unknown-linux-gnu.ranlib=llvm-ranlib arch_deps: - - libssl-dev - pkg-config - - zlib1g-dev - configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --llvm-root=/var/tmp/dist/macosx-toolchain/clang --set rust.jemalloc --target=x86_64-unknown-linux-gnu,[% c("var/build_target") %] --set=target.[% c("var/build_target") %].cc=[% c("var/build_target") %]-clang --set target.x86_64-unknown-linux-gnu.linker=clang --set target.x86_64-unknown-linux-gnu.ar=llvm-ar --set target.x86_64-unknown-linux-gnu.ranlib=llvm-ranlib
windows: var: - arch_deps: - - libssl-dev - - pkg-config - - zlib1g-dev # See tor-browser-build#29320 compiler: mingw-w64 configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --llvm-root=/var/tmp/dist/clang --target=x86_64-unknown-linux-gnu,[% c("arch") %]-pc-windows-gnu --set target.x86_64-unknown-linux-gnu.linker=clang --set target.x86_64-unknown-linux-gnu.ar=llvm-ar --set target.x86_64-unknown-linux-gnu.ranlib=llvm-ranlib + arch_deps: + - pkg-config
input_files: - project: container-image
===================================== projects/tor-android-service/config ===================================== @@ -8,9 +8,6 @@ container: use_container: 1
var: - deps: - - build-essential - - unzip # this should be updated when the list of gradle dependencies is changed gradle_dependencies_version: 5 gradle_version: 5.6.4
===================================== projects/tor-onion-proxy-library/config ===================================== @@ -8,10 +8,6 @@ container: use_container: 1
var: - deps: - - build-essential - - unzip - - zip # this should be updated when the list of gradle dependencies is changed gradle_dependencies_version: 5 gradle_version: 5.6.4
===================================== projects/tor/config ===================================== @@ -9,13 +9,6 @@ tag_gpg_id: 1 container: use_container: 1
-var: - deps: - - build-essential - - automake - - zip - - unzip - targets: nightly: version: '[% c("abbrev") %]' @@ -27,25 +20,15 @@ targets: libdir: lib32 sort_deps: 0 arch_deps: - - libtool - zlib1g-dev:i386 - - hardening-wrapper linux-x86_64: var: libdir: lib64 arch_deps: - - libtool - zlib1g-dev - - hardening-wrapper - macos: - var: - arch_deps: - - faketime android: var: configure_opt_project: '--enable-android --enable-static-openssl --enable-static-libevent --enable-zstd --disable-tool-name-check --disable-system-torrc --disable-system-torrc' - arch_deps: - - libtinfo5
input_files: - project: container-image
===================================== projects/wasi-sysroot/config ===================================== @@ -8,12 +8,6 @@ git_submodule: 1 container: use_container: 1
-targets: - linux: - var: - arch_deps: - - patch - input_files: - project: container-image - name: binutils
===================================== rbm.conf ===================================== @@ -337,11 +337,15 @@ targets: - bison - python3 - python3-distutils + - python3-venv - automake - libtool - zip - unzip - libtinfo5 + - libssl-dev + - pkg-config + - zlib1g-dev configure_opt: '--host=[% c("var/cross_prefix") %] CC=[% c("var/CC") %] [% c("var/configure_opt_project") %]'
pre_pkginst: | @@ -434,6 +438,8 @@ targets: deps: - libc6-dev-i386 - lib32stdc++6 + - pkg-config + - libssl-dev - build-essential - python - bison @@ -442,6 +448,8 @@ targets: - libtool - zip - unzip + - xz-utils + - patch linux-asan: var: asan: 1 @@ -500,6 +508,8 @@ targets: - libtool - zip - unzip + - libssl-dev + - zlib1g-dev
torbrowser-macos: - macos-universal @@ -554,6 +564,7 @@ targets: rlbox: 0 deps: - build-essential + - faketime - python3 - python3-distutils - automake @@ -561,6 +572,8 @@ targets: - libtool - zip - unzip + - libssl-dev + - zlib1g-dev faketime_path: /usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1
# The no_build_id target can be useful if you want to quickly display
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/9...