From c214c727f60b070aa502b20dcc1ad7e3ce8579f2 Mon Sep 17 00:00:00 2001 From: Patrick McDermott Date: Thu, 18 Jun 2020 19:30:25 -0400 Subject: oh-shlibdeps: Hardcode lib dirs, drop ldconfig --- (limited to 'src') diff --git a/src/oh-shlibdeps.sh b/src/oh-shlibdeps.sh index 86ff114..910b194 100644 --- a/src/oh-shlibdeps.sh +++ b/src/oh-shlibdeps.sh @@ -31,8 +31,11 @@ find_lib() local pkg= local dir= - rtld_dirs="$(@LDCONFIG@ -v 2>/dev/null | \ - sed -n 's/^\([^\t].*\):$/\1/p')" + if [ '@multiarch_libdir@' = 'yes' ]; then + rtld_dirs="/lib/${OPK_HOST_ARCH} /usr/lib/${OPK_HOST_ARCH}" + else + rtld_dirs='/lib /usr/lib' + fi # Check just-built packages. for pkg in *.data/; do -- cgit v0.9.1