From 554940cd7b719850085781ad075bd1d117c48790 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 28 Jul 2020 04:05:05 +0300 Subject: [PATCH] kiss: Drop hardcoded musl reference. This replaces the package based exemption with one based on C and POSIX shared library names, removing the hardcoded reference to musl and adding support for more C libraries. This needs testing with non-musl systems. Specifically, the dependency fixer which runs post-build in 'kiss build' should /not/ display anything related to your C library. If it does, please open an issue. --- kiss | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/kiss b/kiss index 44d0c7b..48b7cb2 100755 --- a/kiss +++ b/kiss @@ -448,6 +448,13 @@ pkg_fixdeps() { # Resolve path symlinks to find the real location to the library. cd -P "${dep%/*}" 2>/dev/null || continue + # Skip files owned by libc and POSIX. + case ${dep##*/} in + "" | ld-* | libpthread.so* | lib[cm].so* | libdl.so* |\ + librt.so* | libtrace.so* | libxnet.so*) + continue + esac + # Figure out which package owns the file. dep=$(grep -lFx "${PWD#"$KISS_ROOT"}/${dep##*/}" "$@") dep=${dep%/*} dep=${dep##*/} @@ -456,7 +463,7 @@ pkg_fixdeps() { # Skip listing these packages as dependencies. # The pkg_name portions are to workaround incorrect detections # from -bin or -esr packages. - ""|musl|gcc|llvm|"${pkg_name%%-bin}"|\ + ""|gcc|llvm|"${pkg_name%%-bin}"|\ "${pkg_name%%-esr}"|"${pkg_name%%-esr-bin}") ;; *) printf '%s\n' "$dep"