From patchwork Wed Jul 8 14:55:22 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Monjalon X-Patchwork-Id: 6196 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id E73015A66; Wed, 8 Jul 2015 16:56:43 +0200 (CEST) Received: from mail-wi0-f173.google.com (mail-wi0-f173.google.com [209.85.212.173]) by dpdk.org (Postfix) with ESMTP id CD6A69E7 for ; Wed, 8 Jul 2015 16:56:39 +0200 (CEST) Received: by wiga1 with SMTP id a1so287617759wig.0 for ; Wed, 08 Jul 2015 07:56:39 -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:cc:subject:date:message-id:in-reply-to :references; bh=UzCAkotmBAVVmmgsoo94Oqeu1H5aBeO0IGWhP15Ndsw=; b=gN3X9+Lctr++yXOTAQoibRjdsNpO2ZOOptRrTDpTyN7xLSjSF0hEgeg1Zt6UB6jWhW hj7ADsVOv+Q7Dakyh0RPRxGVp69NFTN43pHeLrW4YAYOhVAnekc3hD6n8AEDdmiHGTFd 2i9rlUNv5ihEIG5oAhMBbycaorMnWwxcsVNmo22aavupFurc/62Olu7FFjuzYmOCmMic Wv6hFZhO+2bTiaFWFLk6hkSxH0kMvcHLycqyEMdkh1qhJepqEMNbz7r3P45C0mCqaBN4 IN0IIYfDiorxhM7AhkQEcUMoh2g94p94ZNmprG/K8e6xuMHDtlD/qdOZV2gYLAB7TWR0 R/pg== X-Gm-Message-State: ALoCoQlVQ1Y7k0tFq36MM9QPX1xBpjSXjiLLebYEjTngoVk+y796YM1C3zoO7g1ur9vZd10/RpVj X-Received: by 10.194.171.129 with SMTP id au1mr21477280wjc.115.1436367399647; Wed, 08 Jul 2015 07:56:39 -0700 (PDT) Received: from localhost.localdomain (136-92-190-109.dsl.ovh.fr. [109.190.92.136]) by smtp.gmail.com with ESMTPSA id lj14sm3332162wic.18.2015.07.08.07.56.38 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 08 Jul 2015 07:56:38 -0700 (PDT) From: Thomas Monjalon To: nhorman@tuxdriver.com Date: Wed, 8 Jul 2015 16:55:22 +0200 Message-Id: <1436367323-19968-2-git-send-email-thomas.monjalon@6wind.com> X-Mailer: git-send-email 2.4.2 In-Reply-To: <1436367323-19968-1-git-send-email-thomas.monjalon@6wind.com> References: <1435874746-32095-1-git-send-email-thomas.monjalon@6wind.com> <1436367323-19968-1-git-send-email-thomas.monjalon@6wind.com> Cc: dev@dpdk.org Subject: [dpdk-dev] [PATCH v2 1/2] mk: remove variables identical to config ones 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" CONFIG_RTE_BUILD_SHARED_LIB and CONFIG_RTE_BUILD_COMBINE_LIBS does not have quotes in their values (only y or n). That's why the variables RTE_BUILD_SHARED_LIB and RTE_BUILD_COMBINE_LIBS are always identical to their CONFIG_ counterpart, and are useless. In order to have consistent naming of config options in the makefiles, these options are removed and the "CONFIG_ prefixed" variables are used. Fixes: e25e4d7ef16b ("mk: shared libraries") Fixes: 4d3d79e7a5c6 ("mk: combined library") Signed-off-by: Thomas Monjalon --- mk/exec-env/bsdapp/rte.vars.mk | 4 ++-- mk/exec-env/linuxapp/rte.vars.mk | 4 ++-- mk/rte.lib.mk | 12 ++++++------ mk/rte.sdkbuild.mk | 2 +- mk/rte.sharelib.mk | 8 ++++---- mk/rte.vars.mk | 8 -------- 6 files changed, 15 insertions(+), 23 deletions(-) diff --git a/mk/exec-env/bsdapp/rte.vars.mk b/mk/exec-env/bsdapp/rte.vars.mk index aed0e18..47a673e 100644 --- a/mk/exec-env/bsdapp/rte.vars.mk +++ b/mk/exec-env/bsdapp/rte.vars.mk @@ -39,7 +39,7 @@ # # examples for RTE_EXEC_ENV: linuxapp, bsdapp # -ifeq ($(RTE_BUILD_SHARED_LIB),y) +ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) EXECENV_CFLAGS = -pthread -fPIC else EXECENV_CFLAGS = -pthread @@ -49,7 +49,7 @@ EXECENV_LDFLAGS = EXECENV_LDLIBS = -lexecinfo EXECENV_ASFLAGS = -ifeq ($(RTE_BUILD_SHARED_LIB),y) +ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) EXECENV_LDLIBS += -lgcc_s endif diff --git a/mk/exec-env/linuxapp/rte.vars.mk b/mk/exec-env/linuxapp/rte.vars.mk index e5af318..5fd7d85 100644 --- a/mk/exec-env/linuxapp/rte.vars.mk +++ b/mk/exec-env/linuxapp/rte.vars.mk @@ -39,7 +39,7 @@ # # examples for RTE_EXEC_ENV: linuxapp, bsdapp # -ifeq ($(RTE_BUILD_SHARED_LIB),y) +ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) EXECENV_CFLAGS = -pthread -fPIC else EXECENV_CFLAGS = -pthread @@ -51,7 +51,7 @@ EXECENV_LDFLAGS = --no-as-needed EXECENV_LDLIBS = -lrt -lm EXECENV_ASFLAGS = -ifeq ($(RTE_BUILD_SHARED_LIB),y) +ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) EXECENV_LDLIBS += -lgcc_s endif diff --git a/mk/rte.lib.mk b/mk/rte.lib.mk index 25aa989..fff62a7 100644 --- a/mk/rte.lib.mk +++ b/mk/rte.lib.mk @@ -37,7 +37,7 @@ include $(RTE_SDK)/mk/internal/rte.depdirs-pre.mk # VPATH contains at least SRCDIR VPATH += $(SRCDIR) -ifeq ($(RTE_BUILD_SHARED_LIB),y) +ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) LIB := $(patsubst %.a,%.so.$(LIBABIVER),$(LIB)) CPU_LDFLAGS += --version-script=$(SRCDIR)/$(EXPORT_MAP) @@ -87,7 +87,7 @@ O_TO_S_DO = @set -e; \ $(O_TO_S) && \ echo $(O_TO_S_CMD) > $(call exe2cmd,$(@)) -ifeq ($(RTE_BUILD_SHARED_LIB),n) +ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),n) O_TO_C = $(AR) crus $(LIB_ONE) $(OBJS-y) O_TO_C_STR = $(subst ','\'',$(O_TO_C)) #'# fix syntax highlight O_TO_C_DISP = $(if $(V),"$(O_TO_C_STR)"," AR_C $(@)") @@ -110,7 +110,7 @@ lib_dir = [ -d $(RTE_OUTPUT)/lib ] || mkdir -p $(RTE_OUTPUT)/lib; # # Archive objects in .a file if needed # -ifeq ($(RTE_BUILD_SHARED_LIB),y) +ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) $(LIB): $(OBJS-y) $(DEP_$(LIB)) FORCE ifeq ($(LIBABIVER),) @echo "Must Specify a $(LIB) ABI version" @@ -130,7 +130,7 @@ endif $(depfile_newer)),\ $(O_TO_S_DO)) -ifeq ($(RTE_BUILD_COMBINE_LIBS),y) +ifeq ($(CONFIG_RTE_BUILD_COMBINE_LIBS),y) $(if $(or \ $(file_missing),\ $(call cmdline_changed,$(O_TO_C_STR)),\ @@ -153,7 +153,7 @@ $(LIB): $(OBJS-y) $(DEP_$(LIB)) FORCE $(depfile_missing),\ $(depfile_newer)),\ $(O_TO_A_DO)) -ifeq ($(RTE_BUILD_COMBINE_LIBS),y) +ifeq ($(CONFIG_RTE_BUILD_COMBINE_LIBS),y) $(if $(or \ $(file_missing),\ $(call cmdline_changed,$(O_TO_C_STR)),\ @@ -171,7 +171,7 @@ $(RTE_OUTPUT)/lib/$(LIB): $(LIB) @echo " INSTALL-LIB $(LIB)" @[ -d $(RTE_OUTPUT)/lib ] || mkdir -p $(RTE_OUTPUT)/lib $(Q)cp -f $(LIB) $(RTE_OUTPUT)/lib -ifeq ($(RTE_BUILD_SHARED_LIB),y) +ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) $(Q)ln -s -f $< $(RTE_OUTPUT)/lib/$(LIBSONAME) endif diff --git a/mk/rte.sdkbuild.mk b/mk/rte.sdkbuild.mk index 352f738..38ec7bd 100644 --- a/mk/rte.sdkbuild.mk +++ b/mk/rte.sdkbuild.mk @@ -93,7 +93,7 @@ $(ROOTDIRS-y): @[ -d $(BUILDDIR)/$@ ] || mkdir -p $(BUILDDIR)/$@ @echo "== Build $@" $(Q)$(MAKE) S=$@ -f $(RTE_SRCDIR)/$@/Makefile -C $(BUILDDIR)/$@ all - @if [ $@ = drivers -a $(RTE_BUILD_COMBINE_LIBS) = y ]; then \ + @if [ $@ = drivers -a $(CONFIG_RTE_BUILD_COMBINE_LIBS) = y ]; then \ $(MAKE) -f $(RTE_SDK)/lib/Makefile sharelib; \ fi diff --git a/mk/rte.sharelib.mk b/mk/rte.sharelib.mk index de53558..7bb7219 100644 --- a/mk/rte.sharelib.mk +++ b/mk/rte.sharelib.mk @@ -34,8 +34,8 @@ include $(RTE_SDK)/mk/internal/rte.build-pre.mk # VPATH contains at least SRCDIR VPATH += $(SRCDIR) -ifeq ($(RTE_BUILD_COMBINE_LIBS),y) -ifeq ($(RTE_BUILD_SHARED_LIB),y) +ifeq ($(CONFIG_RTE_BUILD_COMBINE_LIBS),y) +ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) LIB_ONE := lib$(RTE_LIBNAME).so else LIB_ONE := lib$(RTE_LIBNAME).a @@ -75,8 +75,8 @@ O_TO_A_DO = @set -e; \ # Archive objects to share library # -ifeq ($(RTE_BUILD_COMBINE_LIBS),y) -ifeq ($(RTE_BUILD_SHARED_LIB),y) +ifeq ($(CONFIG_RTE_BUILD_COMBINE_LIBS),y) +ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) $(LIB_ONE): FORCE @[ -d $(dir $@) ] || mkdir -p $(dir $@) $(O_TO_S_DO) diff --git a/mk/rte.vars.mk b/mk/rte.vars.mk index d2f01b6..0469064 100644 --- a/mk/rte.vars.mk +++ b/mk/rte.vars.mk @@ -63,14 +63,6 @@ ifneq ($(BUILDING_RTE_SDK),) RTE_TOOLCHAIN := $(CONFIG_RTE_TOOLCHAIN:"%"=%) 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:"%"=%) - ifeq ($(RTE_BUILD_SHARED_LIB),) - RTE_BUILD_SHARED_LIB := n - endif - RTE_BUILD_COMBINE_LIBS := $(CONFIG_RTE_BUILD_COMBINE_LIBS:"%"=%) - ifeq ($(RTE_BUILD_COMBINE_LIBS),) - RTE_BUILD_COMBINE_LIBS := n - endif endif RTE_LIBNAME := $(CONFIG_RTE_LIBNAME:"%"=%)