a799bf1cde
The upower steps were added after the last green release and had never run successfully — the Jul 13 edge release contains no upower package at all. Six defects, each hiding the next, found by reproducing the steps on the runner: - SOUVERAINE_AARCH64_SYSROOT was exported in the binaries step, not this one; steps do not share environment, so the pkg-config wrapper fell back to /usr/aarch64-linux-gnu and glib was not found. - c_link_args had --sysroot but no -L, so ld could not resolve the bare paths inside the sysroot linker scripts (libm, libmvec). - PKG_CONFIG_LIBDIR covered only lib/pkgconfig; udev.pc lives in share/pkgconfig. Fixed in the wrapper, which overrides the caller. - introspection ran g-ir-scanner against an aarch64 build and failed; disabled for the cross build only (the phone ships no UPowerGlib typelib and quickshell's UPower module is native Qt). - gtk-doc/man default on, but gtkdoc-scan is absent from the runner, so the x86_64 native build would have failed at the same point. - the aarch64 sanity check tested usr/lib/upowerd; it installs to usr/libexec/upowerd, so the check failed even on a good build. Verified on archdev: aarch64 56/56 targets, upowerd is aarch64, built from 628283f with the charge-type fix; x86_64 58/58 native.
14 lines
855 B
Shell
Executable file
14 lines
855 B
Shell
Executable file
#!/bin/bash
|
|
# ponytail: cross pkg-config wrapper for aarch64-unknown-linux-gnu.
|
|
# cargo's [env] block doesn't reliably reach build-script pkg-config probes,
|
|
# so alsa-sys's built-in cross guard trips. This wrapper sets the vars itself
|
|
# and is referenced via PKG_CONFIG in .cargo/config.toml — every pkg-config
|
|
# probe in the tree (alsa-sys today, any future -sys crate) goes through it.
|
|
SYSROOT="${SOUVERAINE_AARCH64_SYSROOT:-/usr/aarch64-linux-gnu}"
|
|
export PKG_CONFIG_ALLOW_CROSS=1
|
|
# Both dirs: udev.pc (and other systemd-shipped .pc files) live in
|
|
# share/pkgconfig, not lib/pkgconfig. This wrapper OVERRIDES whatever the
|
|
# caller exported, so widening it here is the only fix that takes effect.
|
|
export PKG_CONFIG_LIBDIR="$SYSROOT/usr/lib/pkgconfig:$SYSROOT/usr/share/pkgconfig"
|
|
export PKG_CONFIG_SYSROOT_DIR="$SYSROOT"
|
|
exec /usr/bin/pkg-config "$@"
|