Commit d5f8983e authored by Michal Berger's avatar Michal Berger Committed by Tomasz Zawadzki
Browse files

make/check_so_deps: Convert IGNORED_LIBS to assoc array 



Also, move the check against IGNORED_LIBS to import_libs_deps_mk().

Signed-off-by: default avatarMichal Berger <michalx.berger@intel.com>
Change-Id: I190262f728118d65c35481e490ca094086760cfa
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4631


Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent 5d88afca

test/make/check_so_deps.sh

+5 −11
Original line number Diff line number Diff line
@@ -179,6 +179,8 @@ function import_libs_deps_mk() { 
			fun_mk=${dep_mk//@('$('|')')/}

			if [[ $fun_mk != "$dep_mk" ]]; then

				eval "${fun_mk}() { echo \$$fun_mk ; }"

			elif ((IGNORED_LIBS["$dep_mk"] == 1)); then

				continue

			fi

			eval "$var_mk=\${$var_mk:+\$$var_mk }$dep_mk"

		done
@@ -194,14 +196,6 @@ function confirm_deps() { 
	lib_shortname=$(get_lib_shortname "$lib")

	lib_make_deps=(${!lib_shortname})



	for ign_dep in "${IGNORED_LIBS[@]}"; do

		for i in "${!lib_make_deps[@]}"; do

			if [[ ${lib_make_deps[i]} == "$ign_dep" ]]; then

				unset 'lib_make_deps[i]'

			fi

		done

	done



	symbols=$(readelf -s --wide $lib | grep -E "NOTYPE.*GLOBAL.*UND" | awk '{print $8}' | sort | uniq)

	for symbol in $symbols; do

		for deplib in $DEP_LIBS; do
@@ -267,12 +261,12 @@ echo "---------------------------------------------------------------------" 
SPDK_LIBS=$(ls -1 $libdir/libspdk_*.so | grep -v libspdk_env_dpdk.so)

DEP_LIBS=$(ls -1 $libdir/libspdk_*.so)



IGNORED_LIBS=()

declare -A IGNORED_LIBS=()

if grep -q 'CONFIG_VHOST_INTERNAL_LIB?=n' $rootdir/mk/config.mk; then

	IGNORED_LIBS+=("rte_vhost")

	IGNORED_LIBS["rte_vhost"]=1

fi

if grep -q 'CONFIG_RDMA?=n' $rootdir/mk/config.mk; then

	IGNORED_LIBS+=("rdma")

	IGNORED_LIBS["rdma"]=1

fi



(