build: fix aarch64 cross — newer image + xenial pkg name
cross 0.2.5's default aarch64 image is Ubuntu 16.04 (xenial): libfreetype-dev doesn't exist there (it's libfreetype6-dev) and its OpenSSL 1.0.2 / archived repos break modern deps. Pin the :main image (Ubuntu 20.04+) and use the libfreetype6-dev name (valid on both). cc
This commit is contained in:
1 file changed
+13
-6
+13
-6
@@ -2,18 +2,25 @@
|
||||
# aarch64 `qbz` binary from an x86-64 Linux host. Used by
|
||||
# scripts/build-aarch64-linux.sh (CROSS mode).
|
||||
#
|
||||
# The default cross image ships the aarch64 toolchain but NOT the native dev
|
||||
# libs qbz links against, so we add the arm64 multiarch packages in pre-build.
|
||||
# PKG_CONFIG_* is set so the build scripts resolve the :arm64 .pc files.
|
||||
# `image` pins a newer Ubuntu (cross 0.2.5's default aarch64 image is Ubuntu
|
||||
# 16.04 "xenial" — EOL, archived repos, OpenSSL 1.0.2 — which breaks modern
|
||||
# deps). The :main image is Ubuntu 20.04+. If pulling :main ever fails, the
|
||||
# alternative is a newer cross itself:
|
||||
# cargo install cross --git https://github.com/cross-rs/cross --locked
|
||||
#
|
||||
# NOTE: each pre-build entry is a single-line TOML string (no backslash
|
||||
# continuations — those are only valid in TOML """multi-line""" strings).
|
||||
# The image ships the aarch64 toolchain but NOT the native dev libs qbz links
|
||||
# against, so we add the arm64 multiarch packages in pre-build. PKG_CONFIG_* is
|
||||
# set so build scripts resolve the :arm64 .pc files.
|
||||
#
|
||||
# NOTE: each pre-build entry is a single-line TOML string (backslash line
|
||||
# continuations are only valid in TOML """multi-line""" strings).
|
||||
|
||||
[target.aarch64-unknown-linux-gnu]
|
||||
image = "ghcr.io/cross-rs/aarch64-unknown-linux-gnu:main"
|
||||
pre-build = [
|
||||
"dpkg --add-architecture arm64",
|
||||
"apt-get update",
|
||||
"apt-get install -y --no-install-recommends pkg-config cmake clang libclang-dev nasm libasound2-dev:arm64 libjack-jackd2-dev:arm64 libfontconfig1-dev:arm64 libfreetype-dev:arm64 libxkbcommon-dev:arm64 libwayland-dev:arm64 libxcb1-dev:arm64 libgl1-mesa-dev:arm64 libegl1-mesa-dev:arm64 libdbus-1-dev:arm64 libssl-dev:arm64",
|
||||
"apt-get install -y --no-install-recommends pkg-config cmake clang libclang-dev nasm libasound2-dev:arm64 libjack-jackd2-dev:arm64 libfontconfig1-dev:arm64 libfreetype6-dev:arm64 libxkbcommon-dev:arm64 libwayland-dev:arm64 libxcb1-dev:arm64 libgl1-mesa-dev:arm64 libegl1-mesa-dev:arm64 libdbus-1-dev:arm64 libssl-dev:arm64",
|
||||
]
|
||||
|
||||
[target.aarch64-unknown-linux-gnu.env]
|
||||
|
||||
Reference in new issue
Block a user