зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1796517 - Use pkgconf instead of pkg-config on automation. r=firefox-build-system-reviewers,andi
This brings us on par with local builds. Differential Revision: https://phabricator.services.mozilla.com/D159831
This commit is contained in:
Mike Hommey
Родитель
1b7bf9f5cc
Коммит
8111ff36ad
|
|
@ -43,6 +43,7 @@ linux64-base-toolchains/opt:
|
|||
- linux64-sccache
|
||||
- linux64-nasm-2.14.02
|
||||
- linux64-node-12
|
||||
- linux64-pkgconf
|
||||
- sysroot-x86_64-linux-gnu
|
||||
|
||||
linux64-base-toolchains/debug:
|
||||
|
|
@ -82,6 +83,7 @@ linux64-base-toolchains/debug:
|
|||
- linux64-sccache
|
||||
- linux64-nasm-2.14.02
|
||||
- linux64-node-12
|
||||
- linux64-pkgconf
|
||||
- sysroot-x86_64-linux-gnu
|
||||
|
||||
linux64-base-toolchains-clang/opt:
|
||||
|
|
@ -116,6 +118,7 @@ linux64-base-toolchains-clang/opt:
|
|||
- linux64-dump_syms
|
||||
- linux64-nasm-2.14.02
|
||||
- linux64-node-12
|
||||
- linux64-pkgconf
|
||||
- sysroot-x86_64-linux-gnu
|
||||
|
||||
linux64-base-toolchains-clang/debug:
|
||||
|
|
@ -153,4 +156,5 @@ linux64-base-toolchains-clang/debug:
|
|||
- linux64-dump_syms
|
||||
- linux64-nasm-2.14.02
|
||||
- linux64-node-12
|
||||
- linux64-pkgconf
|
||||
- sysroot-x86_64-linux-gnu
|
||||
|
|
|
|||
|
|
@ -46,6 +46,7 @@ linux64/opt:
|
|||
- linux64-sccache
|
||||
- linux64-nasm
|
||||
- linux64-node
|
||||
- linux64-pkgconf
|
||||
- sysroot-x86_64-linux-gnu
|
||||
- sysroot-wasm32-wasi
|
||||
|
||||
|
|
@ -83,6 +84,7 @@ linux64-x11/opt:
|
|||
- linux64-sccache
|
||||
- linux64-nasm
|
||||
- linux64-node
|
||||
- linux64-pkgconf
|
||||
- sysroot-x86_64-linux-gnu-x11
|
||||
- sysroot-wasm32-wasi
|
||||
|
||||
|
|
@ -121,6 +123,7 @@ linux64-plain/opt:
|
|||
- linux64-node
|
||||
- linux64-cbindgen
|
||||
- linux64-dump_syms
|
||||
- linux64-pkgconf
|
||||
- sysroot-x86_64-linux-gnu
|
||||
- sysroot-wasm32-wasi
|
||||
optimization:
|
||||
|
|
@ -164,6 +167,7 @@ linux64-hybrid/plain:
|
|||
- linux64-cbindgen
|
||||
- linux64-sccache
|
||||
- linux64-dump_syms
|
||||
- linux64-pkgconf
|
||||
- sysroot-x86_64-linux-gnu
|
||||
- sysroot-wasm32-wasi
|
||||
|
||||
|
|
@ -204,6 +208,7 @@ linux64-gcc/opt:
|
|||
- linux64-sccache
|
||||
- linux64-nasm
|
||||
- linux64-node
|
||||
- linux64-pkgconf
|
||||
- sysroot-x86_64-linux-gnu
|
||||
- sysroot-wasm32-wasi
|
||||
|
||||
|
|
@ -244,6 +249,7 @@ linux64-plain-clang-trunk/opt:
|
|||
- linux64-cbindgen
|
||||
- linux64-dump_syms
|
||||
- linux64-toolchain-sysroot
|
||||
- linux64-pkgconf
|
||||
- sysroot-x86_64-linux-gnu
|
||||
- sysroot-wasm32-wasi
|
||||
optimization:
|
||||
|
|
@ -289,6 +295,7 @@ linux64-fuzzing/debug:
|
|||
- linux64-rust-size
|
||||
- linux64-nasm
|
||||
- linux64-node
|
||||
- linux64-pkgconf
|
||||
- sysroot-x86_64-linux-gnu
|
||||
- sysroot-wasm32-wasi
|
||||
optimization:
|
||||
|
|
@ -334,6 +341,7 @@ linux64-fuzzing-noopt/debug:
|
|||
- linux64-rust-size
|
||||
- linux64-nasm
|
||||
- linux64-node
|
||||
- linux64-pkgconf
|
||||
- sysroot-x86_64-linux-gnu
|
||||
- sysroot-wasm32-wasi
|
||||
optimization:
|
||||
|
|
@ -380,6 +388,7 @@ linux64/debug:
|
|||
- linux64-rust-size
|
||||
- linux64-nasm
|
||||
- linux64-node
|
||||
- linux64-pkgconf
|
||||
- sysroot-x86_64-linux-gnu
|
||||
- sysroot-wasm32-wasi
|
||||
|
||||
|
|
@ -418,6 +427,7 @@ linux64-plain/debug:
|
|||
- linux64-node
|
||||
- linux64-cbindgen
|
||||
- linux64-dump_syms
|
||||
- linux64-pkgconf
|
||||
- sysroot-x86_64-linux-gnu
|
||||
- sysroot-wasm32-wasi
|
||||
optimization:
|
||||
|
|
@ -471,6 +481,7 @@ linux64-devedition/opt:
|
|||
- linux64-dump_syms
|
||||
- linux64-nasm
|
||||
- linux64-node
|
||||
- linux64-pkgconf
|
||||
- sysroot-x86_64-linux-gnu
|
||||
- sysroot-wasm32-wasi
|
||||
|
||||
|
|
@ -511,6 +522,7 @@ linux/opt:
|
|||
- linux64-sccache
|
||||
- linux64-nasm
|
||||
- linux64-node
|
||||
- linux64-pkgconf
|
||||
- sysroot-i686-linux-gnu
|
||||
- sysroot-x86_64-linux-gnu
|
||||
- sysroot-wasm32-wasi
|
||||
|
|
@ -553,6 +565,7 @@ linux/debug:
|
|||
- linux64-sccache
|
||||
- linux64-nasm
|
||||
- linux64-node
|
||||
- linux64-pkgconf
|
||||
- sysroot-i686-linux-gnu
|
||||
- sysroot-x86_64-linux-gnu
|
||||
- sysroot-wasm32-wasi
|
||||
|
|
@ -594,6 +607,7 @@ linux-rusttests/opt:
|
|||
- linux64-sccache
|
||||
- linux64-nasm
|
||||
- linux64-node
|
||||
- linux64-pkgconf
|
||||
- sysroot-i686-linux-gnu
|
||||
- sysroot-x86_64-linux-gnu
|
||||
- sysroot-wasm32-wasi
|
||||
|
|
@ -637,6 +651,7 @@ linux-rusttests/debug:
|
|||
- linux64-sccache
|
||||
- linux64-nasm
|
||||
- linux64-node
|
||||
- linux64-pkgconf
|
||||
- sysroot-i686-linux-gnu
|
||||
- sysroot-x86_64-linux-gnu
|
||||
- sysroot-wasm32-wasi
|
||||
|
|
@ -687,6 +702,7 @@ linux-devedition/opt:
|
|||
- linux64-dump_syms
|
||||
- linux64-nasm
|
||||
- linux64-node
|
||||
- linux64-pkgconf
|
||||
- sysroot-i686-linux-gnu
|
||||
- sysroot-x86_64-linux-gnu
|
||||
- sysroot-wasm32-wasi
|
||||
|
|
@ -732,6 +748,7 @@ linux-shippable/opt:
|
|||
- linux64-dump_syms
|
||||
- linux64-nasm
|
||||
- linux64-node
|
||||
- linux64-pkgconf
|
||||
- sysroot-i686-linux-gnu
|
||||
- sysroot-x86_64-linux-gnu
|
||||
- sysroot-wasm32-wasi
|
||||
|
|
@ -775,6 +792,7 @@ linux-reproduced/opt:
|
|||
- linux64-dump_syms
|
||||
- linux64-nasm
|
||||
- linux64-node
|
||||
- linux64-pkgconf
|
||||
- sysroot-i686-linux-gnu
|
||||
- sysroot-x86_64-linux-gnu
|
||||
- sysroot-wasm32-wasi
|
||||
|
|
@ -818,6 +836,7 @@ linux64-reproduced/opt:
|
|||
- linux64-dump_syms
|
||||
- linux64-nasm
|
||||
- linux64-node
|
||||
- linux64-pkgconf
|
||||
- sysroot-x86_64-linux-gnu
|
||||
- sysroot-wasm32-wasi
|
||||
|
||||
|
|
@ -858,6 +877,7 @@ linux64-asan/opt:
|
|||
- linux64-sccache
|
||||
- linux64-nasm
|
||||
- linux64-node
|
||||
- linux64-pkgconf
|
||||
- sysroot-x86_64-linux-gnu
|
||||
- sysroot-wasm32-wasi
|
||||
|
||||
|
|
@ -898,6 +918,7 @@ linux64-tsan/opt:
|
|||
- linux64-sccache
|
||||
- linux64-nasm
|
||||
- linux64-node
|
||||
- linux64-pkgconf
|
||||
- sysroot-x86_64-linux-gnu
|
||||
- sysroot-wasm32-wasi
|
||||
|
||||
|
|
@ -941,6 +962,7 @@ linux64-tsan-fuzzing/opt:
|
|||
- linux64-sccache
|
||||
- linux64-nasm
|
||||
- linux64-node
|
||||
- linux64-pkgconf
|
||||
- sysroot-x86_64-linux-gnu
|
||||
- sysroot-wasm32-wasi
|
||||
optimization:
|
||||
|
|
@ -986,6 +1008,7 @@ linux64-asan-fuzzing/noopt:
|
|||
- linux64-sccache
|
||||
- linux64-nasm
|
||||
- linux64-node
|
||||
- linux64-pkgconf
|
||||
- sysroot-x86_64-linux-gnu
|
||||
- sysroot-wasm32-wasi
|
||||
optimization:
|
||||
|
|
@ -1034,6 +1057,7 @@ linux64-asan-fuzzing-nyx/opt:
|
|||
- linux64-sccache
|
||||
- linux64-nasm
|
||||
- linux64-node
|
||||
- linux64-pkgconf
|
||||
- sysroot-x86_64-linux-gnu
|
||||
- sysroot-wasm32-wasi
|
||||
optimization:
|
||||
|
|
@ -1079,6 +1103,7 @@ linux64-asan-fuzzing/opt:
|
|||
- linux64-sccache
|
||||
- linux64-nasm
|
||||
- linux64-node
|
||||
- linux64-pkgconf
|
||||
- sysroot-x86_64-linux-gnu
|
||||
- sysroot-wasm32-wasi
|
||||
optimization:
|
||||
|
|
@ -1124,6 +1149,7 @@ linux64-asan-fuzzing-ccov/opt:
|
|||
- linux64-sccache
|
||||
- linux64-nasm
|
||||
- linux64-node
|
||||
- linux64-pkgconf
|
||||
- sysroot-x86_64-linux-gnu
|
||||
- sysroot-wasm32-wasi
|
||||
|
||||
|
|
@ -1164,6 +1190,7 @@ linux64-fuzzing-ccov/opt:
|
|||
- linux64-sccache
|
||||
- linux64-nasm
|
||||
- linux64-node
|
||||
- linux64-pkgconf
|
||||
- sysroot-x86_64-linux-gnu
|
||||
- sysroot-wasm32-wasi
|
||||
optimization:
|
||||
|
|
@ -1218,6 +1245,7 @@ linux64-asan-reporter-shippable/opt:
|
|||
- linux64-llvm-symbolizer
|
||||
- linux64-nasm
|
||||
- linux64-node
|
||||
- linux64-pkgconf
|
||||
- sysroot-x86_64-linux-gnu
|
||||
- sysroot-wasm32-wasi
|
||||
|
||||
|
|
@ -1257,6 +1285,7 @@ linux64-asan/debug:
|
|||
- linux64-sccache
|
||||
- linux64-nasm
|
||||
- linux64-node
|
||||
- linux64-pkgconf
|
||||
- sysroot-x86_64-linux-gnu
|
||||
- sysroot-wasm32-wasi
|
||||
optimization:
|
||||
|
|
@ -1307,6 +1336,7 @@ linux64-shippable/opt:
|
|||
- linux64-dump_syms
|
||||
- linux64-nasm
|
||||
- linux64-node
|
||||
- linux64-pkgconf
|
||||
- sysroot-x86_64-linux-gnu
|
||||
- sysroot-wasm32-wasi
|
||||
|
||||
|
|
@ -1348,6 +1378,7 @@ linux64-noopt/debug:
|
|||
- linux64-sccache
|
||||
- linux64-nasm
|
||||
- linux64-node
|
||||
- linux64-pkgconf
|
||||
- sysroot-x86_64-linux-gnu
|
||||
- sysroot-wasm32-wasi
|
||||
|
||||
|
|
@ -1388,6 +1419,7 @@ linux64-rusttests/opt:
|
|||
- linux64-sccache
|
||||
- linux64-nasm
|
||||
- linux64-node
|
||||
- linux64-pkgconf
|
||||
- sysroot-x86_64-linux-gnu
|
||||
- sysroot-wasm32-wasi
|
||||
optimization:
|
||||
|
|
@ -1430,6 +1462,7 @@ linux64-rusttests/debug:
|
|||
- linux64-sccache
|
||||
- linux64-nasm
|
||||
- linux64-node
|
||||
- linux64-pkgconf
|
||||
- sysroot-x86_64-linux-gnu
|
||||
- sysroot-wasm32-wasi
|
||||
optimization:
|
||||
|
|
@ -1477,6 +1510,7 @@ linux64-ccov/opt:
|
|||
- linux64-nasm
|
||||
- linux64-node
|
||||
- linux64-grcov
|
||||
- linux64-pkgconf
|
||||
- sysroot-x86_64-linux-gnu
|
||||
- sysroot-wasm32-wasi
|
||||
|
||||
|
|
@ -1517,6 +1551,7 @@ linux64-ccov/debug:
|
|||
- linux64-nasm
|
||||
- linux64-node
|
||||
- linux64-grcov
|
||||
- linux64-pkgconf
|
||||
- sysroot-x86_64-linux-gnu
|
||||
- sysroot-wasm32-wasi
|
||||
|
||||
|
|
@ -1555,6 +1590,7 @@ linux64-add-on-devel/opt:
|
|||
- linux64-sccache
|
||||
- linux64-nasm
|
||||
- linux64-node
|
||||
- linux64-pkgconf
|
||||
- sysroot-x86_64-linux-gnu
|
||||
- sysroot-wasm32-wasi
|
||||
|
||||
|
|
@ -1594,6 +1630,7 @@ linux64-aarch64/opt:
|
|||
- linux64-cbindgen
|
||||
- linux64-dump_syms
|
||||
- linux64-node
|
||||
- linux64-pkgconf
|
||||
- sysroot-aarch64-linux-gnu
|
||||
- sysroot-x86_64-linux-gnu
|
||||
- sysroot-wasm32-wasi
|
||||
|
|
|
|||
|
|
@ -66,6 +66,7 @@ jobs:
|
|||
- linux64-dump_syms
|
||||
- linux64-nasm
|
||||
- linux64-node
|
||||
- linux64-pkgconf
|
||||
- sysroot-i686-linux-gnu
|
||||
- sysroot-x86_64-linux-gnu
|
||||
- sysroot-wasm32-wasi
|
||||
|
|
@ -95,6 +96,7 @@ jobs:
|
|||
- linux64-dump_syms
|
||||
- linux64-nasm
|
||||
- linux64-node
|
||||
- linux64-pkgconf
|
||||
- sysroot-x86_64-linux-gnu
|
||||
- sysroot-wasm32-wasi
|
||||
|
||||
|
|
|
|||
|
|
@ -57,6 +57,7 @@ jobs:
|
|||
- linux64-rust
|
||||
- linux64-cbindgen
|
||||
- linux64-dump_syms
|
||||
- linux64-pkgconf
|
||||
- sysroot-x86_64-linux-gnu
|
||||
- sysroot-wasm32-wasi
|
||||
|
||||
|
|
|
|||
|
|
@ -64,6 +64,7 @@ jobs:
|
|||
- linux64-cbindgen
|
||||
- linux64-nasm
|
||||
- linux64-node
|
||||
- linux64-pkgconf
|
||||
- sysroot-x86_64-linux-gnu
|
||||
- sysroot-wasm32-wasi
|
||||
|
||||
|
|
|
|||
|
|
@ -58,6 +58,7 @@ jobs:
|
|||
- linux64-sccache
|
||||
- linux64-nasm
|
||||
- linux64-node
|
||||
- linux64-pkgconf
|
||||
- sysroot-x86_64-linux-gnu
|
||||
- sysroot-wasm32-wasi
|
||||
optimization:
|
||||
|
|
|
|||
|
|
@ -47,8 +47,7 @@ RUN apt-get update && \
|
|||
wget \
|
||||
x11-utils \
|
||||
xvfb \
|
||||
zip \
|
||||
pkg-config
|
||||
zip
|
||||
|
||||
# Add wrapper scripts for xvfb allowing tasks to easily retry starting up xvfb
|
||||
# %include taskcluster/docker/recipes/xvfb.sh
|
||||
|
|
|
|||
|
|
@ -31,7 +31,6 @@ RUN apt-get update && \
|
|||
libmpfr-dev \
|
||||
nasm \
|
||||
opam \
|
||||
pkg-config \
|
||||
patch \
|
||||
p7zip-full \
|
||||
procps \
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче