config: fix combined/shared lib

- 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
- RTE_LIBNAME had no quote in "C context" (include/rte_config.h)
- and then CONFIG_RTE_LIBNAME quotes were not properly removed in "make context"

Signed-off-by: Thomas Monjalon <thomas.monjalon@6wind.com>
Acked-by: Olivier Matz <olivier.matz@6wind.com>

diff --git a/config/defconfig_i686-default-linuxapp-gcc b/config/defconfig_i686-default-linuxapp-gcc
index b340592f67614838eef5de5b403830aca58ba3a4..10a3db2b26c6ca78c77f0737699be62bd739673c 100644 (file)
--- a/config/defconfig_i686-default-linuxapp-gcc
+++ b/config/defconfig_i686-default-linuxapp-gcc
@@ -73,6 +73,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
 #

diff --git a/config/defconfig_i686-default-linuxapp-icc b/config/defconfig_i686-default-linuxapp-icc
index d6b7e22f889114c86878df5dfdb25c6bdb81d8be..d3fdd950f54e549161f36a64f31a897fec6b0d6c 100644 (file)
--- 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 a680dd43bfa2d1eefbc01a12ebf2edc067260bbf..95430cf77dacfebaa2714df60c0bdca5a5c4ab73 100644 (file)
--- a/config/defconfig_x86_64-default-linuxapp-gcc
+++ b/config/defconfig_x86_64-default-linuxapp-gcc
@@ -76,15 +76,14 @@ 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
 #

diff --git a/config/defconfig_x86_64-default-linuxapp-icc b/config/defconfig_x86_64-default-linuxapp-icc
index 41e2151383cbc4847e403916263aee3d6437cbe8..83dae84f707e4e8013444a5d13ce6f2c9a136b94 100644 (file)
--- 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 297336177f61b02db4be438ac53e724b0d3f4744..4257687a1c65c4dcf0df8c1e5dc9c4364d1b9977 100644 (file)
--- 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.