boklm pushed to branch main at The Tor Project / Applications / tor-browser-build
Commits:
-
cb3ba59c
by NoisyCoil at 2024-10-17T13:37:29+02:00
-
c10878fd
by NoisyCoil at 2024-10-17T13:37:29+02:00
7 changed files:
- projects/clang/config
- projects/cmake/config
- projects/ninja/config
- projects/node/config
- projects/python/config
- projects/rust/config
- projects/wasi-sysroot/config
Changes:
| ... | ... | @@ -6,15 +6,20 @@ container: |
| 6 | 6 | |
| 7 | 7 | var:
|
| 8 | 8 | llvm_version: '[% pc("llvm-project", "version") %]'
|
| 9 | + no_crosscompile: 1
|
|
| 9 | 10 | |
| 10 | 11 | input_files:
|
| 11 | 12 | - project: container-image
|
| 12 | 13 | - name: '[% c("var/compiler") %]'
|
| 13 | 14 | project: '[% c("var/compiler") %]'
|
| 14 | 15 | enable: '[% c("var/linux") %]'
|
| 16 | + # Override the target to make sure we don't have linux-cross
|
|
| 15 | 17 | - name: binutils
|
| 16 | 18 | project: binutils
|
| 17 | 19 | enable: '[% c("var/linux") %]'
|
| 20 | + target:
|
|
| 21 | + - '[% c("var/channel") %]'
|
|
| 22 | + - '[% c("var/projectname") %]-linux-x86_64'
|
|
| 18 | 23 | - project: cmake
|
| 19 | 24 | name: cmake
|
| 20 | 25 | - project: llvm-project
|
| ... | ... | @@ -7,6 +7,8 @@ gpg_keyring: cmake.gpg |
| 7 | 7 | filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]'
|
| 8 | 8 | container:
|
| 9 | 9 | use_container: 1
|
| 10 | +var:
|
|
| 11 | + no_crosscompile: 1
|
|
| 10 | 12 | |
| 11 | 13 | input_files:
|
| 12 | 14 | - project: container-image
|
| ... | ... | @@ -5,6 +5,8 @@ git_hash: a524bf3f6bacd1b4ad85d719eed2737d8562f27a #v1.11.1 |
| 5 | 5 | filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]'
|
| 6 | 6 | container:
|
| 7 | 7 | use_container: 1
|
| 8 | +var:
|
|
| 9 | + no_crosscompile: 1
|
|
| 8 | 10 | |
| 9 | 11 | input_files:
|
| 10 | 12 | - project: container-image
|
| ... | ... | @@ -6,15 +6,20 @@ container: |
| 6 | 6 | var:
|
| 7 | 7 | node_version: 18.19.0
|
| 8 | 8 | node_sha256: f52b41af20596a9abd8ed75241837ec43945468221448bbf841361e2091819b6
|
| 9 | + no_crosscompile: 1
|
|
| 9 | 10 | |
| 10 | 11 | input_files:
|
| 11 | 12 | - URL: 'https://nodejs.org/dist/v[% c("var/node_version") %]/node-v[% c("var/node_version") %].tar.xz'
|
| 12 | 13 | sha256sum: '[% c("var/node_sha256") %]'
|
| 13 | 14 | name: node
|
| 14 | 15 | - project: container-image
|
| 16 | + # Override the target to make sure we don't have linux-cross
|
|
| 15 | 17 | - project: binutils
|
| 16 | 18 | name: binutils
|
| 17 | 19 | enable: '[% c("var/linux") %]'
|
| 20 | + target:
|
|
| 21 | + - '[% c("var/channel") %]'
|
|
| 22 | + - '[% c("var/projectname") %]-linux-x86_64'
|
|
| 18 | 23 | - project: '[% c("var/compiler") %]'
|
| 19 | 24 | name: '[% c("var/compiler") %]'
|
| 20 | 25 | enable: '[% c("var/linux") %]'
|
| ... | ... | @@ -4,6 +4,7 @@ filename: 'python-[% c("var/build_id") %].tar.[% c("compress_tar") %]' |
| 4 | 4 | container:
|
| 5 | 5 | use_container: 1
|
| 6 | 6 | var:
|
| 7 | + no_crosscompile: 1
|
|
| 7 | 8 | deps:
|
| 8 | 9 | - build-essential
|
| 9 | 10 | - python-all
|
| ... | ... | @@ -19,6 +19,11 @@ targets: |
| 19 | 19 | target: i686-unknown-linux-gnu
|
| 20 | 20 | target_flags: --set target.i686-unknown-linux-gnu.linker=clang --set target.i686-unknown-linux-gnu.ar=llvm-ar --set target.i686-unknown-linux-gnu.ranlib=llvm-ranlib
|
| 21 | 21 | |
| 22 | + linux-aarch64:
|
|
| 23 | + var:
|
|
| 24 | + target: aarch64-unknown-linux-gnu
|
|
| 25 | + target_flags: --set target.aarch64-unknown-linux-gnu.linker=aarch64-linux-gnu-gcc --set target.aarch64-unknown-linux-gnu.ar=llvm-ar --set target.aarch64-unknown-linux-gnu.ranlib=llvm-ranlib
|
|
| 26 | + |
|
| 22 | 27 | macos:
|
| 23 | 28 | var:
|
| 24 | 29 | target: '[% c("var/build_target") %]'
|
| ... | ... | @@ -12,6 +12,9 @@ git_submodule: 0 |
| 12 | 12 | container:
|
| 13 | 13 | use_container: 1
|
| 14 | 14 | |
| 15 | +var:
|
|
| 16 | + no_crosscompile: 1
|
|
| 17 | + |
|
| 15 | 18 | input_files:
|
| 16 | 19 | - project: container-image
|
| 17 | 20 | # We do not use GCC, but we need its libsdc++ to run Clang
|