- Configuration for combined and shared library was only in the template
defconfig_x86_64-default-linuxapp-gcc.
- CONFIG_RTE_LIBNAME was in the wrong section
- CONFIG_RTE_LIBNAME quotes were not properly removed in "make context"
- RTE_LIBNAME had no quote in "C context" (include/rte_config.h)
Signed-off-by: Thomas Monjalon <thomas.monjalon at 6wind.com>
---
config/defconfig_i686-default-linuxapp-gcc | 11 +++++++++++
config/defconfig_i686-default-linuxapp-icc | 10 ++++++++++
config/defconfig_x86_64-default-linuxapp-gcc | 3 +--
config/defconfig_x86_64-default-linuxapp-icc | 10 ++++++++++
mk/rte.vars.mk | 8 ++++----
5 files changed, 36 insertions(+), 6 deletions(-)
diff --git a/config/defconfig_i686-default-linuxapp-gcc
b/config/defconfig_i686-default-linuxapp-gcc
index a36a398..1894896 100644
--- a/config/defconfig_i686-default-linuxapp-gcc
+++ b/config/defconfig_i686-default-linuxapp-gcc
@@ -74,6 +74,17 @@ CONFIG_RTE_TOOLCHAIN_GCC=y
CONFIG_RTE_FORCE_INTRINSICS=n
#
+# Compile to share library
+#
+CONFIG_RTE_BUILD_SHARED_LIB=n
+
+#
+# Combine to one single library
+#
+CONFIG_RTE_BUILD_COMBINE_LIBS=n
+CONFIG_RTE_LIBNAME="intel_dpdk"
+
+#
# Compile libc directory
#
CONFIG_RTE_LIBC=n
diff --git a/config/defconfig_i686-default-linuxapp-icc
b/config/defconfig_i686-default-linuxapp-icc
index 7ed3325..b100560 100644
--- a/config/defconfig_i686-default-linuxapp-icc
+++ b/config/defconfig_i686-default-linuxapp-icc
@@ -74,6 +74,16 @@ CONFIG_RTE_TOOLCHAIN_ICC=y
CONFIG_RTE_FORCE_INTRINSICS=n
#
+# Compile to share library
+#
+CONFIG_RTE_BUILD_SHARED_LIB=n
+
+#
+# Combine to one single library
+#
+CONFIG_RTE_BUILD_COMBINE_LIBS=n
+CONFIG_RTE_LIBNAME="intel_dpdk"
+
#
# Compile libc directory
#
diff --git a/config/defconfig_x86_64-default-linuxapp-gcc
b/config/defconfig_x86_64-default-linuxapp-gcc
index c70a478..cb8e405 100644
--- a/config/defconfig_x86_64-default-linuxapp-gcc
+++ b/config/defconfig_x86_64-default-linuxapp-gcc
@@ -76,16 +76,15 @@ CONFIG_RTE_FORCE_INTRINSICS=n
#
# Compile to share library
#
-CONFIG_RTE_LIBNAME=intel_dpdk
CONFIG_RTE_BUILD_SHARED_LIB=n
#
# Combine to one single library
#
CONFIG_RTE_BUILD_COMBINE_LIBS=n
+CONFIG_RTE_LIBNAME="intel_dpdk"
#
-#
# Compile libc directory
#
CONFIG_RTE_LIBC=n
diff --git a/config/defconfig_x86_64-default-linuxapp-icc
b/config/defconfig_x86_64-default-linuxapp-icc
index 034e4ed..167ed74 100644
--- a/config/defconfig_x86_64-default-linuxapp-icc
+++ b/config/defconfig_x86_64-default-linuxapp-icc
@@ -74,6 +74,16 @@ CONFIG_RTE_TOOLCHAIN_ICC=y
CONFIG_RTE_FORCE_INTRINSICS=n
#
+# Compile to share library
+#
+CONFIG_RTE_BUILD_SHARED_LIB=n
+
+#
+# Combine to one single library
+#
+CONFIG_RTE_BUILD_COMBINE_LIBS=n
+CONFIG_RTE_LIBNAME="intel_dpdk"
+
#
# Compile libc directory
#
diff --git a/mk/rte.vars.mk b/mk/rte.vars.mk
index c517dd0..fa5839f 100644
--- a/mk/rte.vars.mk
+++ b/mk/rte.vars.mk
@@ -64,10 +64,6 @@ ifneq ($(BUILDING_RTE_SDK),)
RTE_TARGET := $(RTE_ARCH)-$(RTE_MACHINE)-$(RTE_EXEC_ENV)-$(RTE_TOOLCHAIN)
RTE_SDK_BIN := $(RTE_OUTPUT)
RTE_BUILD_SHARED_LIB := $(CONFIG_RTE_BUILD_SHARED_LIB:"%"=%)
- RTE_LIBNAME := $(CONFIG_RTE_LIBNAME:"%s"=%)
- ifeq ($(RTE_LIBNAME),)
- RTE_LIBNAME := intel_dpdk
- endif
ifeq ($(RTE_BUILD_SHARED_LIB),)
RTE_BUILD_SHARED_LIB := n
endif
@@ -75,6 +71,10 @@ ifneq ($(BUILDING_RTE_SDK),)
ifeq ($(RTE_BUILD_COMBINE_LIBS),)
RTE_BUILD_COMBINE_LIBS := n
endif
+ RTE_LIBNAME := $(CONFIG_RTE_LIBNAME:"%"=%)
+ ifeq ($(RTE_LIBNAME),)
+ RTE_LIBNAME := intel_dpdk
+ endif
endif
# RTE_TARGET is deducted from config when we are building the SDK.
--
1.7.10.4
