Unverified Commit 2df9fec5 authored by boklm's avatar boklm Committed by Matthew Finkel
Browse files

Bug 40333: Add a temporary ff91esr target in rbm.conf

parent 73a31196
......@@ -13,7 +13,7 @@ var:
use_container: 1
targets:
android:
ff91esr:
var:
cbindgen_version: 0.19.0
cbindgen_hash: d9e490ce8b836194595bd30611253a7028059da2
......
......@@ -25,7 +25,7 @@ export LLVM_HOME=$(pwd)
mkdir build
cd build
# XXX: remove duplicated parts while fixing tor-browser-build#40048
[% IF ! c("var/android") %]
[% IF ! c("var/ff91esr") %]
cmake .. -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=$distdir \
-DCMAKE_BUILD_TYPE:STRING=Release \
[% IF c("var/rlbox") -%]-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly \[% END -%]
......
......@@ -8,7 +8,7 @@ var:
use_container: 1
targets:
android:
ff91esr:
var:
llvm_version: '[% pc("llvm-project", "version") %]'
......@@ -32,7 +32,7 @@ input_files:
name: cmake
- project: clang-source
name: clang-source
enable: '[% ! c("var/android") %]'
enable: '[% ! c("var/ff91esr") %]'
- project: llvm-project
name: clang-source
enable: '[% c("var/android") %]'
enable: '[% c("var/ff91esr") %]'
......@@ -8,7 +8,7 @@ var:
use_container: 1
targets:
android:
ff91esr:
var:
node_version: 10.23.1
node_hash: 88aa16f5af79615b183ca55ed81393763169e75d1fb96013cf1831895c6cedfa
......
......@@ -4,7 +4,7 @@ distdir=/var/tmp/dist/[% project %]
mkdir -p $distdir
tar -C /var/tmp/dist -xf [% c('input_files_by_name/cmake') %]
export PATH="/var/tmp/dist/cmake/bin:$PATH"
[% IF c("var/android") %]
[% IF c("var/ff91esr") %]
tar -C /var/tmp/dist -xf [% c('input_files_by_name/ninja') %]
export PATH=/var/tmp/dist/ninja:$PATH
[% END %]
......@@ -40,7 +40,7 @@ mkdir /var/tmp/build
tar -C /var/tmp/build -xf [% c('input_files_by_name/rust') %]
cd /var/tmp/build/rustc-[% c('version') %]-src
[% IF ! c("var/android") %]
[% IF ! c("var/ff91esr") %]
# LLVM has reproducibility issues when optimizing bitcode, which we need to
# patch. See: #32053 for more details.
cd src/llvm-project
......
......@@ -9,10 +9,12 @@ var:
use_container: 1
targets:
android:
ff91esr:
var:
current_version: 1.52.0
previous_version: 1.51.0
android:
var:
arch_deps:
- libssl-dev
- pkg-config
......@@ -81,7 +83,7 @@ input_files:
name: cmake
- project: ninja
name: ninja
enable: '[% c("var/android") %]'
enable: '[% c("var/ff91esr") %]'
- project: '[% c("var/compiler") %]'
name: '[% c("var/compiler") %]'
- URL: 'https://static.rust-lang.org/dist/rustc-[% c("var/current_version") %]-src.tar.gz'
......@@ -98,4 +100,4 @@ input_files:
enable: '[% c("var/windows-i686") %]'
- filename: 43909.patch
name: 43909
enable: '[% ! c("var/android") %]'
enable: '[% ! c("var/ff91esr") %]'
......@@ -265,9 +265,17 @@ targets:
- zip
- unzip
# Temporary target for the switch to firefox91. We use it to switch each
# platform separately to firefox91, and we should remove it once all
# platforms have been moved to it.
ff91esr:
var:
ff91esr: 1
torbrowser-android-armv7:
- android-armv7
- android
- ff91esr
android-armv7:
arch: armv7
var:
......@@ -279,6 +287,7 @@ targets:
torbrowser-android-x86:
- android-x86
- android
- ff91esr
android-x86:
arch: x86
var:
......@@ -290,6 +299,7 @@ targets:
torbrowser-android-x86_64:
- android-x86_64
- android
- ff91esr
android-x86_64:
arch: x86_64
var:
......@@ -301,6 +311,7 @@ targets:
torbrowser-android-aarch64:
- android-aarch64
- android
- ff91esr
android-aarch64:
arch: aarch64
var:
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment