Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/4263/?format=api
{ "id": 4263, "url": "https://patches.dpdk.org/api/patches/4263/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1428505645-5578-2-git-send-email-sergio.gonzalez.monroy@intel.com/", "project": { "id": 1, "url": "https://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<1428505645-5578-2-git-send-email-sergio.gonzalez.monroy@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1428505645-5578-2-git-send-email-sergio.gonzalez.monroy@intel.com", "date": "2015-04-08T15:07:21", "name": "[dpdk-dev,v3,1/5] mk: remove combined library and related options", "commit_ref": null, "pull_url": null, "state": "rejected", "archived": true, "hash": "c3db86e58b56834191ddff518cdce8966a3bd5ef", "submitter": { "id": 73, "url": "https://patches.dpdk.org/api/people/73/?format=api", "name": "Sergio Gonzalez Monroy", "email": "sergio.gonzalez.monroy@intel.com" }, "delegate": null, "mbox": "https://patches.dpdk.org/project/dpdk/patch/1428505645-5578-2-git-send-email-sergio.gonzalez.monroy@intel.com/mbox/", "series": [], "comments": "https://patches.dpdk.org/api/patches/4263/comments/", "check": "pending", "checks": "https://patches.dpdk.org/api/patches/4263/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [IPv6:::1])\n\tby dpdk.org (Postfix) with ESMTP id 8DDA8683D;\n\tWed, 8 Apr 2015 17:07:55 +0200 (CEST)", "from mga09.intel.com (mga09.intel.com [134.134.136.24])\n\tby dpdk.org (Postfix) with ESMTP id BCB12683D\n\tfor <dev@dpdk.org>; Wed, 8 Apr 2015 17:07:51 +0200 (CEST)", "from fmsmga001.fm.intel.com ([10.253.24.23])\n\tby orsmga102.jf.intel.com with ESMTP; 08 Apr 2015 08:07:27 -0700", "from irvmail001.ir.intel.com ([163.33.26.43])\n\tby fmsmga001.fm.intel.com with ESMTP; 08 Apr 2015 08:07:26 -0700", "from sivswdev02.ir.intel.com (sivswdev02.ir.intel.com\n\t[10.237.217.46])\n\tby irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id\n\tt38F7Q2R016603 for <dev@dpdk.org>; Wed, 8 Apr 2015 16:07:26 +0100", "from sivswdev02.ir.intel.com (localhost [127.0.0.1])\n\tby sivswdev02.ir.intel.com with ESMTP id t38F7QDB005623\n\tfor <dev@dpdk.org>; Wed, 8 Apr 2015 16:07:26 +0100", "(from smonroy@localhost)\n\tby sivswdev02.ir.intel.com with id t38F7Q7n005619\n\tfor dev@dpdk.org; Wed, 8 Apr 2015 16:07:26 +0100" ], "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.11,545,1422950400\"; d=\"scan'208\";a=\"692235952\"", "From": "Sergio Gonzalez Monroy <sergio.gonzalez.monroy@intel.com>", "To": "dev@dpdk.org", "Date": "Wed, 8 Apr 2015 16:07:21 +0100", "Message-Id": "<1428505645-5578-2-git-send-email-sergio.gonzalez.monroy@intel.com>", "X-Mailer": "git-send-email 1.8.5.4", "In-Reply-To": "<1428505645-5578-1-git-send-email-sergio.gonzalez.monroy@intel.com>", "References": "<1428505645-5578-1-git-send-email-sergio.gonzalez.monroy@intel.com>", "Subject": "[dpdk-dev] [PATCH v3 1/5] mk: remove combined library and related\n\toptions", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "patches and discussions about DPDK <dev.dpdk.org>", "List-Unsubscribe": "<http://dpdk.org/ml/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://dpdk.org/ml/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<http://dpdk.org/ml/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Currently, the target/rules to build combined libraries is different\nthan the one to build individual libraries.\n\nBy removing the combined library option as a build configuration option\nwe simplify the build pocess by having a single point for linking/archiving\nlibraries in DPDK.\n\nThis patch removes CONFIG_RTE_BUILD_COMBINE_LIB build config option and\nremoves the makefiles associated with building a combined library.\n\nThe CONFIG_RTE_LIBNAME config option is kept as it will be use to\nalways generate a linker script that acts as a single combined library.\n\nSigned-off-by: Sergio Gonzalez Monroy <sergio.gonzalez.monroy@intel.com>\n---\n config/common_bsdapp | 3 +-\n config/common_linuxapp | 3 +-\n lib/Makefile | 1 -\n mk/rte.app.mk | 12 ------\n mk/rte.lib.mk | 35 -----------------\n mk/rte.sdkbuild.mk | 3 --\n mk/rte.sharelib.mk | 101 -------------------------------------------------\n mk/rte.vars.mk | 4 --\n 8 files changed, 2 insertions(+), 160 deletions(-)\n delete mode 100644 mk/rte.sharelib.mk", "diff": "diff --git a/config/common_bsdapp b/config/common_bsdapp\nindex a8ba484..ab6be97 100644\n--- a/config/common_bsdapp\n+++ b/config/common_bsdapp\n@@ -79,9 +79,8 @@ CONFIG_RTE_FORCE_INTRINSICS=n\n CONFIG_RTE_BUILD_SHARED_LIB=n\n \n #\n-# Combine to one single library\n+# Combined library name\n #\n-CONFIG_RTE_BUILD_COMBINE_LIBS=n\n CONFIG_RTE_LIBNAME=intel_dpdk\n \n #\ndiff --git a/config/common_linuxapp b/config/common_linuxapp\nindex 0b25f34..1ae4304 100644\n--- a/config/common_linuxapp\n+++ b/config/common_linuxapp\n@@ -79,9 +79,8 @@ CONFIG_RTE_FORCE_INTRINSICS=n\n CONFIG_RTE_BUILD_SHARED_LIB=n\n \n #\n-# Combine to one single library\n+# Combined library name\n #\n-CONFIG_RTE_BUILD_COMBINE_LIBS=n\n CONFIG_RTE_LIBNAME=\"intel_dpdk\"\n \n #\ndiff --git a/lib/Makefile b/lib/Makefile\nindex d94355d..c34cf2f 100644\n--- a/lib/Makefile\n+++ b/lib/Makefile\n@@ -77,5 +77,4 @@ DIRS-$(CONFIG_RTE_LIBRTE_KNI) += librte_kni\n DIRS-$(CONFIG_RTE_LIBRTE_IVSHMEM) += librte_ivshmem\n endif\n \n-include $(RTE_SDK)/mk/rte.sharelib.mk\n include $(RTE_SDK)/mk/rte.subdir.mk\ndiff --git a/mk/rte.app.mk b/mk/rte.app.mk\nindex 56886dc..e8630b6 100644\n--- a/mk/rte.app.mk\n+++ b/mk/rte.app.mk\n@@ -61,12 +61,6 @@ ifeq ($(NO_AUTOLIBS),)\n \n LDLIBS += --whole-archive\n \n-ifeq ($(CONFIG_RTE_BUILD_COMBINE_LIBS),y)\n-LDLIBS += -l$(RTE_LIBNAME)\n-endif\n-\n-ifeq ($(CONFIG_RTE_BUILD_COMBINE_LIBS),n)\n-\n ifeq ($(CONFIG_RTE_LIBRTE_DISTRIBUTOR),y)\n LDLIBS += -lrte_distributor\n endif\n@@ -137,8 +131,6 @@ ifeq ($(CONFIG_RTE_LIBRTE_VHOST), y)\n LDLIBS += -lrte_vhost\n endif\n \n-endif # ! CONFIG_RTE_BUILD_COMBINE_LIBS\n-\n ifeq ($(CONFIG_RTE_LIBRTE_PMD_PCAP),y)\n LDLIBS += -lpcap\n endif\n@@ -153,8 +145,6 @@ endif\n \n LDLIBS += --start-group\n \n-ifeq ($(CONFIG_RTE_BUILD_COMBINE_LIBS),n)\n-\n ifeq ($(CONFIG_RTE_LIBRTE_KVARGS),y)\n LDLIBS += -lrte_kvargs\n endif\n@@ -253,8 +243,6 @@ endif\n \n endif # plugins\n \n-endif # ! CONFIG_RTE_BUILD_COMBINE_LIBS\n-\n LDLIBS += $(EXECENV_LDLIBS)\n \n LDLIBS += --end-group\ndiff --git a/mk/rte.lib.mk b/mk/rte.lib.mk\nindex 0d7482d..d96101a 100644\n--- a/mk/rte.lib.mk\n+++ b/mk/rte.lib.mk\n@@ -87,24 +87,6 @@ O_TO_S_DO = @set -e; \\\n \t$(O_TO_S) && \\\n \techo $(O_TO_S_CMD) > $(call exe2cmd,$(@))\n \n-ifeq ($(RTE_BUILD_SHARED_LIB),n)\n-O_TO_C = $(AR) crus $(LIB_ONE) $(OBJS-y)\n-O_TO_C_STR = $(subst ','\\'',$(O_TO_C)) #'# fix syntax highlight\n-O_TO_C_DISP = $(if $(V),\"$(O_TO_C_STR)\",\" AR_C $(@)\")\n-O_TO_C_DO = @set -e; \\\n-\t$(lib_dir) \\\n-\t$(copy_obj)\n-else\n-O_TO_C = $(LD) -shared $(OBJS-y) -o $(LIB_ONE)\n-O_TO_C_STR = $(subst ','\\'',$(O_TO_C)) #'# fix syntax highlight\n-O_TO_C_DISP = $(if $(V),\"$(O_TO_C_STR)\",\" LD_C $(@)\")\n-O_TO_C_DO = @set -e; \\\n-\t$(lib_dir) \\\n-\t$(copy_obj)\n-endif\n-\n-copy_obj = cp -f $(OBJS-y) $(RTE_OUTPUT)/build/lib;\n-lib_dir = [ -d $(RTE_OUTPUT)/lib ] || mkdir -p $(RTE_OUTPUT)/lib;\n -include .$(LIB).cmd\n \n #\n@@ -129,15 +111,6 @@ endif\n \t\t$(depfile_missing),\\\n \t\t$(depfile_newer)),\\\n \t\t$(O_TO_S_DO))\n-\n-ifeq ($(RTE_BUILD_COMBINE_LIBS),y)\n-\t$(if $(or \\\n- $(file_missing),\\\n- $(call cmdline_changed,$(O_TO_C_STR)),\\\n- $(depfile_missing),\\\n- $(depfile_newer)),\\\n- $(O_TO_C_DO))\n-endif\n else\n $(LIB): $(OBJS-y) $(DEP_$(LIB)) FORCE\n \t@[ -d $(dir $@) ] || mkdir -p $(dir $@)\n@@ -153,14 +126,6 @@ $(LIB): $(OBJS-y) $(DEP_$(LIB)) FORCE\n \t $(depfile_missing),\\\n \t $(depfile_newer)),\\\n \t $(O_TO_A_DO))\n-ifeq ($(RTE_BUILD_COMBINE_LIBS),y)\n-\t$(if $(or \\\n- $(file_missing),\\\n- $(call cmdline_changed,$(O_TO_C_STR)),\\\n- $(depfile_missing),\\\n- $(depfile_newer)),\\\n- $(O_TO_C_DO))\n-endif\n endif\n \n #\ndiff --git a/mk/rte.sdkbuild.mk b/mk/rte.sdkbuild.mk\nindex 3154457..2b24e74 100644\n--- a/mk/rte.sdkbuild.mk\n+++ b/mk/rte.sdkbuild.mk\n@@ -93,9 +93,6 @@ $(ROOTDIRS-y):\n \t@[ -d $(BUILDDIR)/$@ ] || mkdir -p $(BUILDDIR)/$@\n \t@echo \"== Build $@\"\n \t$(Q)$(MAKE) S=$@ -f $(RTE_SRCDIR)/$@/Makefile -C $(BUILDDIR)/$@ all\n-\t@if [ $@ = lib -a $(RTE_BUILD_COMBINE_LIBS) = y ]; then \\\n-\t\t$(MAKE) -f $(RTE_SDK)/lib/Makefile sharelib; \\\n-\tfi\n \n %_clean:\n \t@echo \"== Clean $*\"\ndiff --git a/mk/rte.sharelib.mk b/mk/rte.sharelib.mk\ndeleted file mode 100644\nindex de53558..0000000\n--- a/mk/rte.sharelib.mk\n+++ /dev/null\n@@ -1,101 +0,0 @@\n-# BSD LICENSE\n-#\n-# Copyright(c) 2010-2014 Intel Corporation. All rights reserved.\n-# All rights reserved.\n-#\n-# Redistribution and use in source and binary forms, with or without\n-# modification, are permitted provided that the following conditions\n-# are met:\n-#\n-# * Redistributions of source code must retain the above copyright\n-# notice, this list of conditions and the following disclaimer.\n-# * Redistributions in binary form must reproduce the above copyright\n-# notice, this list of conditions and the following disclaimer in\n-# the documentation and/or other materials provided with the\n-# distribution.\n-# * Neither the name of Intel Corporation nor the names of its\n-# contributors may be used to endorse or promote products derived\n-# from this software without specific prior written permission.\n-#\n-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n-# \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\n-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\n-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\n-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\n-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\n-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\n-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\n-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\n-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n-\n-include $(RTE_SDK)/mk/internal/rte.build-pre.mk\n-\n-# VPATH contains at least SRCDIR\n-VPATH += $(SRCDIR)\n-\n-ifeq ($(RTE_BUILD_COMBINE_LIBS),y)\n-ifeq ($(RTE_BUILD_SHARED_LIB),y)\n-LIB_ONE := lib$(RTE_LIBNAME).so\n-else\n-LIB_ONE := lib$(RTE_LIBNAME).a\n-endif\n-endif\n-\n-.PHONY:sharelib\n-sharelib: $(LIB_ONE) FORCE\n-\n-OBJS = $(wildcard $(RTE_OUTPUT)/build/lib/*.o)\n-\n-ifeq ($(LINK_USING_CC),1)\n-# Override the definition of LD here, since we're linking with CC\n-LD := $(CC) $(CPU_CFLAGS)\n-O_TO_S = $(LD) $(call linkerprefix,$(CPU_LDFLAGS)) \\\n-\t-shared $(OBJS) -o $(RTE_OUTPUT)/lib/$(LIB_ONE)\n-else\n-O_TO_S = $(LD) $(CPU_LDFLAGS) \\\n-\t-shared $(OBJS) -o $(RTE_OUTPUT)/lib/$(LIB_ONE)\n-endif\n-\n-O_TO_S_STR = $(subst ','\\'',$(O_TO_S)) #'# fix syntax highlight\n-O_TO_S_DISP = $(if $(V),\"$(O_TO_S_STR)\",\" LD $(@)\")\n-O_TO_S_CMD = \"cmd_$@ = $(O_TO_S_STR)\"\n-O_TO_S_DO = @set -e; \\\n- echo $(O_TO_S_DISP); \\\n- $(O_TO_S)\n-\n-O_TO_A = $(AR) crus $(RTE_OUTPUT)/lib/$(LIB_ONE) $(OBJS)\n-O_TO_A_STR = $(subst ','\\'',$(O_TO_A)) #'# fix syntax highlight\n-O_TO_A_DISP = $(if $(V),\"$(O_TO_A_STR)\",\" LD $(@)\")\n-O_TO_A_CMD = \"cmd_$@ = $(O_TO_A_STR)\"\n-O_TO_A_DO = @set -e; \\\n- echo $(O_TO_A_DISP); \\\n- $(O_TO_A)\n-#\n-# Archive objects to share library\n-#\n-\n-ifeq ($(RTE_BUILD_COMBINE_LIBS),y)\n-ifeq ($(RTE_BUILD_SHARED_LIB),y)\n-$(LIB_ONE): FORCE\n-\t@[ -d $(dir $@) ] || mkdir -p $(dir $@)\n-\t$(O_TO_S_DO)\n-else\n-$(LIB_ONE): FORCE\n-\t@[ -d $(dir $@) ] || mkdir -p $(dir $@)\n-\t$(O_TO_A_DO)\n-endif\n-endif\n-\n-#\n-# Clean all generated files\n-#\n-.PHONY: clean\n-clean: _postclean\n-\n-.PHONY: doclean\n-doclean:\n-\t$(Q)rm -rf $(LIB_ONE)\n-\n-.PHONY: FORCE\n-FORCE:\ndiff --git a/mk/rte.vars.mk b/mk/rte.vars.mk\nindex d2f01b6..fd06175 100644\n--- a/mk/rte.vars.mk\n+++ b/mk/rte.vars.mk\n@@ -67,10 +67,6 @@ ifneq ($(BUILDING_RTE_SDK),)\n ifeq ($(RTE_BUILD_SHARED_LIB),)\n RTE_BUILD_SHARED_LIB := n\n endif\n- RTE_BUILD_COMBINE_LIBS := $(CONFIG_RTE_BUILD_COMBINE_LIBS:\"%\"=%)\n- ifeq ($(RTE_BUILD_COMBINE_LIBS),)\n- RTE_BUILD_COMBINE_LIBS := n\n- endif\n endif\n \n RTE_LIBNAME := $(CONFIG_RTE_LIBNAME:\"%\"=%)\n", "prefixes": [ "dpdk-dev", "v3", "1/5" ] }