Unverified Commit 3410482e authored by Georg Koppen's avatar Georg Koppen
Browse files

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.
parent f232e5d2
#!/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'),
}) %]
# 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
......@@ -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
......
......@@ -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
......
......@@ -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") %]
......
# 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/[% c("version") %]/node-[% c("version") %].tar.xz'
sha256sum: 18e37f891d10ea7fbc8f6410c444c2b1d9cc3cbbb1d35aa9c41f761816956608
sha256sum: 26b01fa28338cacaa8a66d7963ab2514e81678c268ab52ec55dcf937aadcb73b
name: node
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