From 25abd532e2a381d62214ac4aec6c47272f4259c4 Mon Sep 17 00:00:00 2001
From: Jim Harris <james.r.harris@intel.com>
Date: Tue, 25 Jan 2022 18:50:15 +0000
Subject: [PATCH] Revert "build/dpdk: allow SPDK static builds on DPDK shared
 libs"

This reverts commit 241d06070a9e91583399288e517055d50fb8ac8e.

Fixes #2352.

Signed-off-by: Jim Harris <james.r.harris@intel.com>
Change-Id: I40b81446cc1c02f18a0b986fb5f0a7a6e31de466
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/11293
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Paul Luse <paul.e.luse@intel.com>
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
---
 lib/env_dpdk/env.mk | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/lib/env_dpdk/env.mk b/lib/env_dpdk/env.mk
index 59c2e3f3c..36257fb03 100644
--- a/lib/env_dpdk/env.mk
+++ b/lib/env_dpdk/env.mk
@@ -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)