-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ci: improve pkg-config configuration and formatting
- Add PKG_CONFIG_LIBDIR to both CI and release workflows - Format YAML files for better readability - Simplify Cross.arch.toml commands - Move build.env to Cross.toml for pkg-config passthrough
- Loading branch information
Showing
4 changed files
with
29 additions
and
30 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,5 @@ | ||
[target.aarch64-unknown-linux-gnu] | ||
pre-build = [ | ||
"pacman -Syu --noconfirm", | ||
"pacman -S --noconfirm systemd-libs" | ||
] | ||
pre-build = ["pacman -Syu --noconfirm", "pacman -S --noconfirm systemd-libs"] | ||
|
||
[target.armv7-unknown-linux-gnueabihf] | ||
pre-build = [ | ||
"pacman -Syu --noconfirm", | ||
"pacman -S --noconfirm systemd-libs" | ||
] | ||
pre-build = ["pacman -Syu --noconfirm", "pacman -S --noconfirm systemd-libs"] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,17 +1,20 @@ | ||
[target.aarch64-unknown-linux-gnu] | ||
pre-build = [ | ||
"dpkg --add-architecture arm64 && apt-get update && apt-get install -y libudev-dev:arm64", | ||
] | ||
|
||
[target.armv7-unknown-linux-gnueabihf] | ||
pre-build = [ | ||
"dpkg --add-architecture armhf && apt-get update && apt-get install -y libudev-dev:armhf", | ||
] | ||
|
||
[build.env] | ||
passthrough = [ | ||
"PKG_CONFIG_ALLOW_CROSS", | ||
"PKG_CONFIG_PATH", | ||
"PKG_CONFIG_SYSROOT_DIR", | ||
"PKG_CONFIG_LIBDIR", | ||
] | ||
|
||
[target.aarch64-unknown-linux-gnu] | ||
pre-build = [ | ||
"dpkg --add-architecture arm64", | ||
"apt-get update", | ||
"apt-get install --assume-yes libudev-dev:arm64 pkg-config", | ||
] | ||
[target.armv7-unknown-linux-gnueabihf] | ||
pre-build = [ | ||
"dpkg --add-architecture armhf", | ||
"apt-get update", | ||
"apt-get install --assume-yes libudev-dev:armhf pkg-config", | ||
] |