From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wg0-f54.google.com (mail-wg0-f54.google.com [74.125.82.54]) by dpdk.org (Postfix) with ESMTP id 9FBE14BBC for ; Wed, 23 Oct 2013 12:05:21 +0200 (CEST) Received: by mail-wg0-f54.google.com with SMTP id c11so548446wgh.33 for ; Wed, 23 Oct 2013 03:06:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id; bh=w+5RFCnfQgz/shtyt9k4dGo3A9CLbtJkJIHLG9Z38Mk=; b=ObAO6rtQQVuOo+MtnzXWG4ygUj5yHefKjdB2DfritZSO9LKB7qpLOcfVNp3U4+YoZW bXGOV2A1jLEfKOxSpxQdu/idqwsa9EHiX5NRplw7ewXaJhNDceKPbGnFRfVH88lW+9Cr qwWGXuI9akVlWkVowwHqrNGOHgJhJPKQNP1Wc63bldpdWXFgFaQQBBJ0fSGaI2kFQ7+G P2782jY/M67lNxDiYQVvulQ0II6OTSqBxAmbf2XE6QZFM98dx4z+KXD2/q1h7zOLH8QC pCMJ+wXSJlAVpcP0ML3mjDbJ6Vnit04fZHnGlE7sd12yoIdIH0SXxF0wDeOmsWahmTlt aLvg== X-Gm-Message-State: ALoCoQn6lGEahwoD1p75jOIxFsaMxYo91RRg5wn15Z1Om0BXR/3i25P8KpTMqQ+iRsOyBadyO5Fj X-Received: by 10.194.75.165 with SMTP id d5mr878834wjw.18.1382522769144; Wed, 23 Oct 2013 03:06:09 -0700 (PDT) Received: from 6wind.com (6wind.net2.nerim.net. [213.41.180.237]) by mx.google.com with ESMTPSA id ev4sm15236236wib.7.2013.10.23.03.06.06 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 23 Oct 2013 03:06:08 -0700 (PDT) Received: by 6wind.com (sSMTP sendmail emulation); Wed, 23 Oct 2013 12:06:05 +0200 From: Thomas Monjalon To: dev@dpdk.org Date: Wed, 23 Oct 2013 12:06:04 +0200 Message-Id: <1382522765-27254-1-git-send-email-thomas.monjalon@6wind.com> X-Mailer: git-send-email 1.7.10.4 Subject: [dpdk-dev] [PATCH] config: fix combined/shared lib X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Oct 2013 10:05:22 -0000 - 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 --- 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