Commit 25abd532 authored by Jim Harris's avatar Jim Harris
Browse files

Revert "build/dpdk: allow SPDK static builds on DPDK shared libs" 



This reverts commit 241d0607.

Fixes #2352.

Signed-off-by: default avatarJim Harris <james.r.harris@intel.com>
Change-Id: I40b81446cc1c02f18a0b986fb5f0a7a6e31de466
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/11293


Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarPaul Luse <paul.e.luse@intel.com>
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent a2dedf06

lib/env_dpdk/env.mk

+1 −5
Original line number Diff line number Diff line
@@ -167,15 +167,11 @@ endif 


ifeq ($(CONFIG_SHARED),y)

ENV_DPDK_FILE = $(call spdk_lib_list_to_shared_libs,env_dpdk)

else

ENV_DPDK_FILE = $(call spdk_lib_list_to_static_libs,env_dpdk)

endif



ifneq (,$(DPDK_SHARED_LIB))

ENV_LIBS = $(ENV_DPDK_FILE) $(DPDK_SHARED_LIB)

DPDK_LINKER_ARGS = -Wl,-rpath-link $(DPDK_LIB_DIR) $(DPDK_SHARED_LIB_LINKER_ARGS)

ENV_LINKER_ARGS = $(ENV_DPDK_FILE) $(DPDK_LINKER_ARGS)

else

ENV_DPDK_FILE = $(call spdk_lib_list_to_static_libs,env_dpdk)

ENV_LIBS = $(ENV_DPDK_FILE) $(DPDK_STATIC_LIB)

DPDK_LINKER_ARGS = -Wl,-rpath-link $(DPDK_LIB_DIR) $(DPDK_STATIC_LIB_LINKER_ARGS)

ENV_LINKER_ARGS = $(ENV_DPDK_FILE) $(DPDK_LINKER_ARGS)