daniel543x/craft-common-actions
1
0 Fork 0
mirror of https://github.com/storytold/craft-common-actions.git synced 2026-11-15 15:02:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #239 from storytold/fix/freebsd-aarch64-pkgconfig

Browse Source 
fix(freebsd): validate aarch64 pkg-config paths
This commit is contained in:
Dylan M. Taylor authored and GitHub committed 2026-11-14 18:27:38 -05:00
2 parents 9aeb563e3f 0ed80a2122
commit a3f9743cb2
2 files changed
+22 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.github/workflows/freebsd.yml
+11 -1
View File
@@ -199,8 +199,18 @@ jobs:
export CARGO_BUILD_TARGET=$target
export CARGO_TARGET_AARCH64_UNKNOWN_FREEBSD_LINKER=$X/cc
export CC_aarch64_unknown_freebsd=$X/cc CXX_aarch64_unknown_freebsd=$X/c++ AR_aarch64_unknown_freebsd=/usr/bin/ar
export PKG_CONFIG_ALLOW_CROSS=1 PKG_CONFIG_SYSROOT_DIR=$S PKG_CONFIG_LIBDIR=$S/usr/local/libdata/pkgconfig:$S/usr/libdata/pkgconfig
export PKG_CONFIG_ALLOW_CROSS=1 PKG_CONFIG_SYSROOT_DIR=$S
export PKG_CONFIG_PATH=$S/usr/local/libdata/pkgconfig:$S/usr/local/lib/pkgconfig:$S/usr/libdata/pkgconfig
export PKG_CONFIG_LIBDIR=$PKG_CONFIG_PATH
EOF
. "$X/env"
if ! pkg-config --exists gdk-3.0; then
echo "error: pkg-config cannot resolve gdk-3.0 from the aarch64 sysroot" >&2
ls -l "$S/usr/local/libdata/pkgconfig/gdk-3.0.pc" >&2
sed -n '1,100p' "$S/usr/local/libdata/pkgconfig/gdk-3.0.pc" >&2
pkg-config --debug --print-errors --modversion gdk-3.0 || true
exit 1
fi
rustc --print target-libdir --target "$target"
- name: Restore FreeBSD Cargo cache
id: cargo-cache
.github/workflows/release.yml
+11 -1
View File
@@ -901,8 +901,18 @@ jobs:
export CARGO_BUILD_TARGET=$target
export CARGO_TARGET_AARCH64_UNKNOWN_FREEBSD_LINKER=$X/cc
export CC_aarch64_unknown_freebsd=$X/cc CXX_aarch64_unknown_freebsd=$X/c++ AR_aarch64_unknown_freebsd=/usr/bin/ar
export PKG_CONFIG_ALLOW_CROSS=1 PKG_CONFIG_SYSROOT_DIR=$S PKG_CONFIG_LIBDIR=$S/usr/local/libdata/pkgconfig:$S/usr/libdata/pkgconfig
export PKG_CONFIG_ALLOW_CROSS=1 PKG_CONFIG_SYSROOT_DIR=$S
export PKG_CONFIG_PATH=$S/usr/local/libdata/pkgconfig:$S/usr/local/lib/pkgconfig:$S/usr/libdata/pkgconfig
export PKG_CONFIG_LIBDIR=$PKG_CONFIG_PATH
EOF
. "$X/env"
if ! pkg-config --exists gdk-3.0; then
echo "error: pkg-config cannot resolve gdk-3.0 from the aarch64 sysroot" >&2
ls -l "$S/usr/local/libdata/pkgconfig/gdk-3.0.pc" >&2
sed -n '1,100p' "$S/usr/local/libdata/pkgconfig/gdk-3.0.pc" >&2
pkg-config --debug --print-errors --modversion gdk-3.0 || true
exit 1
fi
rustc --print target-libdir --target "$target"
- name: Restore FreeBSD release Cargo cache
id: cargo-cache