From 3344a31c411090b8eb9614b8efaac99a70b7f9e7 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Thu, 15 May 2025 09:06:45 -0400 Subject: [PATCH] common/hooks/pre-pkg/04-generate-runtime-deps: use 3rd shlibs field to skip shlibs that should be different on different archs for this to work, the specially-handled arch must be before the generic one, for example: libc.so musl1.1-1.1.24_1 armv7l-musl libc.so musl-1.2.5_1 --- common/hooks/pre-pkg/04-generate-runtime-deps.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/hooks/pre-pkg/04-generate-runtime-deps.sh b/common/hooks/pre-pkg/04-generate-runtime-deps.sh index 658257b1948..8de23a52ac0 100644 --- a/common/hooks/pre-pkg/04-generate-runtime-deps.sh +++ b/common/hooks/pre-pkg/04-generate-runtime-deps.sh @@ -117,7 +117,7 @@ hook() { _pkgname=${_pkgname%.nosoname} _sdep="${_pkgname}-${version}_${revision}" else - _rdep="$(awk -v sl="$f" '$1 == sl { print $2; exit; }' "$mapshlibs")" + _rdep="$(awk -v sl="$f" -v arch="$XBPS_TARGET_MACHINE" '$1 == sl && ($3 == "" || $3 == "ignore" || $3 == arch) { print $2; exit; }' "$mapshlibs")" if [ -z "$_rdep" ]; then msg_red_nochroot " SONAME: $f <-> UNKNOWN PKG PLEASE FIX!\n"