ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make/check_so_deps: Use function to get the short name of the lib

Browse Source 
Change-Id: I2def5ca17c8c34447a398a7d210b6dce6a50ecc4
Signed-off-by: Michal Berger <michalx.berger@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4630
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Michal Berger 2020-10-13 10:58:17 +02:00 committed by Tomasz Zawadzki
parent 4c859a6da5
commit 5d88afca2a
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test/make/check_so_deps.sh
View File

@ -163,6 +163,11 @@ EOF
echo "Processed $processed_so objects." echo "Processed $processed_so objects."
} }
function get_lib_shortname() {
local lib=${1##*/}
echo "${lib//@(libspdk_|.so)/}"
}
function import_libs_deps_mk() { function import_libs_deps_mk() {
local var_mk val_mk dep_mk fun_mk local var_mk val_mk dep_mk fun_mk
while read -r var_mk _ val_mk; do while read -r var_mk _ val_mk; do
@ -186,7 +191,7 @@ function confirm_deps() {
dep_names=() dep_names=()
found_symbol_lib="" 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}) lib_make_deps=(${!lib_shortname})
for ign_dep in "${IGNORED_LIBS[@]}"; do for ign_dep in "${IGNORED_LIBS[@]}"; do
@ -205,7 +210,7 @@ function confirm_deps() {
fi fi
found_symbol=$(readelf -s --wide $deplib | grep -E "DEFAULT\s+[0-9]+\s$symbol$") || true found_symbol=$(readelf -s --wide $deplib | grep -E "DEFAULT\s+[0-9]+\s$symbol$") || true
if [ "$found_symbol" != "" ]; then 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 break
fi fi
done done