From 5d88afca2a394c3786bb1cc9a8b6637351fb6673 Mon Sep 17 00:00:00 2001 From: Michal Berger Date: Tue, 13 Oct 2020 10:58:17 +0200 Subject: [PATCH] make/check_so_deps: Use function to get the short name of the lib Change-Id: I2def5ca17c8c34447a398a7d210b6dce6a50ecc4 Signed-off-by: Michal Berger Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4630 Tested-by: SPDK CI Jenkins Reviewed-by: Shuhei Matsumoto Reviewed-by: Jim Harris --- test/make/check_so_deps.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/test/make/check_so_deps.sh b/test/make/check_so_deps.sh index db3d18e74..d57e1dd43 100755 --- a/test/make/check_so_deps.sh +++ b/test/make/check_so_deps.sh @@ -163,6 +163,11 @@ EOF echo "Processed $processed_so objects." } +function get_lib_shortname() { + local lib=${1##*/} + echo "${lib//@(libspdk_|.so)/}" +} + function import_libs_deps_mk() { local var_mk val_mk dep_mk fun_mk while read -r var_mk _ val_mk; do @@ -186,7 +191,7 @@ function confirm_deps() { dep_names=() found_symbol_lib="" - lib_shortname=$(basename "$lib" | sed 's,libspdk_,,g' | sed 's,\.so,,g') + lib_shortname=$(get_lib_shortname "$lib") lib_make_deps=(${!lib_shortname}) for ign_dep in "${IGNORED_LIBS[@]}"; do @@ -205,7 +210,7 @@ function confirm_deps() { fi found_symbol=$(readelf -s --wide $deplib | grep -E "DEFAULT\s+[0-9]+\s$symbol$") || true if [ "$found_symbol" != "" ]; then - found_symbol_lib=$(basename $deplib | sed 's,libspdk_,,g' | sed 's,\.so,,g') + found_symbol_lib=$(get_lib_shortname "$deplib") break fi done