commit 3410482e8620a030c2c8a998555b7b4b92118d76 Author: Georg Koppen gk@torproject.org Date: Sun Jun 14 11:15:00 2020 +0000

Bug 40005: Adapt Node project for Firefox 78 ESR

We remove our fenix-node project, too, as there is no difference between it and the node project anymore. It seems both ESR and non-ESR are using the same version for the time being. --- projects/fenix-node/build | 24 ------------------------ projects/fenix-node/config | 18 ------------------ projects/geckoview/build | 2 +- projects/geckoview/config | 6 +++--- projects/node/build | 4 ++-- projects/node/config | 5 +++-- 6 files changed, 9 insertions(+), 50 deletions(-)

diff --git a/projects/fenix-node/build b/projects/fenix-node/build deleted file mode 100644 index 8cc8ea5..0000000 --- a/projects/fenix-node/build +++ /dev/null @@ -1,24 +0,0 @@ -#!/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 deleted file mode 100644 index b3534f4..0000000 --- a/projects/fenix-node/config +++ /dev/null @@ -1,18 +0,0 @@ -# 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/%5B% c("version") %]/node-[% c("version") %].tar.xz' - sha256sum: 26b01fa28338cacaa8a66d7963ab2514e81678c268ab52ec55dcf937aadcb73b - name: node diff --git a/projects/geckoview/build b/projects/geckoview/build index b12c096..9eee8c4 100644 --- a/projects/geckoview/build +++ b/projects/geckoview/build @@ -20,7 +20,7 @@ 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/binutils') %] -export PATH="/var/tmp/dist/fenix-rust/bin:/var/tmp/dist/fenix-cbindgen:/var/tmp/dist/nasm/bin:/var/tmp/dist/python/bin:/var/tmp/dist/fenix-node/bin:/var/tmp/dist/fenix-clang/bin:/var/tmp/dist/binutils/bin:$PATH" +export PATH="/var/tmp/dist/fenix-rust/bin:/var/tmp/dist/fenix-cbindgen:/var/tmp/dist/nasm/bin:/var/tmp/dist/python/bin:/var/tmp/dist/node/bin:/var/tmp/dist/fenix-clang/bin:/var/tmp/dist/binutils/bin:$PATH"

tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz

diff --git a/projects/geckoview/config b/projects/geckoview/config index e82139a..c046660 100644 --- a/projects/geckoview/config +++ b/projects/geckoview/config @@ -47,7 +47,7 @@ steps:

tar -C $distdir -xf [% c('input_files_by_name/node') %] tar -C $distdir -xf [% c('input_files_by_name/python') %] - export PATH="/var/tmp/dist/fenix-node/bin:/var/tmp/dist/python/bin:$PATH" + export PATH="/var/tmp/dist/node/bin:/var/tmp/dist/python/bin:$PATH"

tar -C $builddir -xf [% c('input_files_by_name/geckoview_armv7') %] tar -C $builddir -xf [% c('input_files_by_name/geckoview_aarch64') %] @@ -97,7 +97,7 @@ steps: - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' pkg_type: build - - project: fenix-node + - project: node name: node pkg_type: build - project: python @@ -147,7 +147,7 @@ input_files: name: rust - project: fenix-cbindgen name: cbindgen - - project: fenix-node + - project: node name: node - project: nasm name: nasm diff --git a/projects/node/build b/projects/node/build index 0e6ca04..8cc8ea5 100644 --- a/projects/node/build +++ b/projects/node/build @@ -10,8 +10,8 @@ export PATH="/var/tmp/dist/binutils/bin:$PATH" [% END -%] distdir=/var/tmp/dist/[% project %] -tar -xf [% project %]-[% c('version') %].tar.xz -cd [% project %]-[% c('version') %] +tar -xf [% c('input_files_by_name/node') %] +cd node-[% c('version') %]

./configure --prefix=$distdir make -j[% c("buildconf/num_procs") %] diff --git a/projects/node/config b/projects/node/config index e023380..b3534f4 100644 --- a/projects/node/config +++ b/projects/node/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: v10.16.0 +version: v10.21.0 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: container: @@ -14,4 +14,5 @@ input_files: name: '[% c("var/compiler") %]' enable: '[% c("var/linux") %]' - URL: 'https://nodejs.org/download/release/%5B% c("version") %]/node-[% c("version") %].tar.xz' - sha256sum: 18e37f891d10ea7fbc8f6410c444c2b1d9cc3cbbb1d35aa9c41f761816956608 + sha256sum: 26b01fa28338cacaa8a66d7963ab2514e81678c268ab52ec55dcf937aadcb73b + name: node