Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/4726/?format=api
http://patches.dpdk.org/api/patches/4726/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1431613292-22414-1-git-send-email-keith.wiles@intel.com/", "project": { "id": 1, "url": "http://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": "<1431613292-22414-1-git-send-email-keith.wiles@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1431613292-22414-1-git-send-email-keith.wiles@intel.com", "date": "2015-05-14T14:21:31", "name": "[dpdk-dev,v10,1/2] mk:Simplify the ifdefs in the makefile", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "bd36ab3aab39e5de356ee23db3a0a5ba977265e1", "submitter": { "id": 166, "url": "http://patches.dpdk.org/api/people/166/?format=api", "name": "Wiles, Keith", "email": "keith.wiles@intel.com" }, "delegate": null, "mbox": "http://patches.dpdk.org/project/dpdk/patch/1431613292-22414-1-git-send-email-keith.wiles@intel.com/mbox/", "series": [], "comments": "http://patches.dpdk.org/api/patches/4726/comments/", "check": "pending", "checks": "http://patches.dpdk.org/api/patches/4726/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 9091F5A45;\n\tThu, 14 May 2015 16:21:40 +0200 (CEST)", "from mga03.intel.com (mga03.intel.com [134.134.136.65])\n\tby dpdk.org (Postfix) with ESMTP id 05FEB5A38\n\tfor <dev@dpdk.org>; Thu, 14 May 2015 16:21:37 +0200 (CEST)", "from orsmga001.jf.intel.com ([10.7.209.18])\n\tby orsmga103.jf.intel.com with ESMTP; 14 May 2015 07:21:37 -0700", "from wchen24-mobl.amr.corp.intel.com ([10.254.90.134])\n\tby orsmga001.jf.intel.com with ESMTP; 14 May 2015 07:21:37 -0700" ], "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.13,429,1427785200\"; d=\"scan'208\";a=\"694861281\"", "From": "Keith Wiles <keith.wiles@intel.com>", "To": "dev@dpdk.org", "Date": "Thu, 14 May 2015 09:21:31 -0500", "Message-Id": "<1431613292-22414-1-git-send-email-keith.wiles@intel.com>", "X-Mailer": "git-send-email 2.3.0", "In-Reply-To": "<1431386066-6147-1-git-send-email-keith.wiles@intel.com>", "References": "<1431386066-6147-1-git-send-email-keith.wiles@intel.com>", "Subject": "[dpdk-dev] [PATCH v10 1/2] mk:Simplify the ifdefs in the makefile", "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": "Simplify the ifdefs in rte.app.mk to make the code more\nreadable and maintainable by introducing a internal\n_LDLIBS-y variable to build up the LDLIBS variable.\n\nThe new internal variable _LDLIBS-y should not be\nused outside of the rte.app.mk file.\n\nSigned-off-by: Keith Wiles <keith.wiles@intel.com>\n---\n mk/rte.app.mk | 243 +++++++++++++++-------------------------------------------\n 1 file changed, 61 insertions(+), 182 deletions(-)", "diff": "diff --git a/mk/rte.app.mk b/mk/rte.app.mk\nindex af8a1b0..4fc582a 100644\n--- a/mk/rte.app.mk\n+++ b/mk/rte.app.mk\n@@ -1,7 +1,7 @@\n # BSD LICENSE\n #\n-# Copyright(c) 2010-2014 Intel Corporation. All rights reserved.\n-# Copyright(c) 2014 6WIND S.A.\n+# Copyright(c) 2010-2015 Intel Corporation. All rights reserved.\n+# Copyright(c) 2014-2015 6WIND S.A.\n # All rights reserved.\n #\n # Redistribution and use in source and binary forms, with or without\n@@ -51,218 +51,97 @@ LDSCRIPT = $(RTE_LDSCRIPT)\n endif\n \n # default path for libs\n-LDLIBS += -L$(RTE_SDK_BIN)/lib\n+_LDLIBS-y += -L$(RTE_SDK_BIN)/lib\n \n #\n # Order is important: from higher level to lower level\n #\n-LDLIBS += --whole-archive\n \n-ifeq ($(CONFIG_RTE_BUILD_COMBINE_LIBS),y)\n-LDLIBS += -l$(RTE_LIBNAME)\n-endif\n+_LDLIBS-y += --whole-archive\n \n-ifeq ($(CONFIG_RTE_BUILD_COMBINE_LIBS),n)\n+_LDLIBS-$(CONFIG_RTE_BUILD_COMBINE_LIBS) += -l$(RTE_LIBNAME)\n \n-ifeq ($(CONFIG_RTE_LIBRTE_DISTRIBUTOR),y)\n-LDLIBS += -lrte_distributor\n-endif\n+ifeq ($(CONFIG_RTE_BUILD_COMBINE_LIBS),n)\n \n-ifeq ($(CONFIG_RTE_LIBRTE_REORDER),y)\n-LDLIBS += -lrte_reorder\n-endif\n+_LDLIBS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += -lrte_distributor\n+_LDLIBS-$(CONFIG_RTE_LIBRTE_REORDER) += -lrte_reorder\n \n-ifeq ($(CONFIG_RTE_LIBRTE_KNI),y)\n ifeq ($(CONFIG_RTE_EXEC_ENV_LINUXAPP),y)\n-LDLIBS += -lrte_kni\n-endif\n+_LDLIBS-$(CONFIG_RTE_LIBRTE_KNI) += -lrte_kni\n+_LDLIBS-$(CONFIG_RTE_LIBRTE_IVSHMEM) += -lrte_ivshmem\n endif\n \n-ifeq ($(CONFIG_RTE_LIBRTE_IVSHMEM),y)\n-ifeq ($(CONFIG_RTE_EXEC_ENV_LINUXAPP),y)\n-LDLIBS += -lrte_ivshmem\n-endif\n-endif\n+_LDLIBS-$(CONFIG_RTE_LIBRTE_PIPELINE) += -lrte_pipeline\n+_LDLIBS-$(CONFIG_RTE_LIBRTE_TABLE) += -lrte_table\n+_LDLIBS-$(CONFIG_RTE_LIBRTE_PORT) += -lrte_port\n+_LDLIBS-$(CONFIG_RTE_LIBRTE_TIMER) += -lrte_timer\n+_LDLIBS-$(CONFIG_RTE_LIBRTE_HASH) += -lrte_hash\n+_LDLIBS-$(CONFIG_RTE_LIBRTE_JOBSTATS) += -lrte_jobstats\n+_LDLIBS-$(CONFIG_RTE_LIBRTE_LPM) += -lrte_lpm\n+_LDLIBS-$(CONFIG_RTE_LIBRTE_POWER) += -lrte_power\n+_LDLIBS-$(CONFIG_RTE_LIBRTE_ACL) += -lrte_acl\n+_LDLIBS-$(CONFIG_RTE_LIBRTE_METER) += -lrte_meter\n \n-ifeq ($(CONFIG_RTE_LIBRTE_PIPELINE),y)\n-LDLIBS += -lrte_pipeline\n-endif\n+_LDLIBS-$(CONFIG_RTE_LIBRTE_SCHED) += -lrte_sched\n+_LDLIBS-$(CONFIG_RTE_LIBRTE_SCHED) += -lm\n+_LDLIBS-$(CONFIG_RTE_LIBRTE_SCHED) += -lrt\n \n-ifeq ($(CONFIG_RTE_LIBRTE_TABLE),y)\n-LDLIBS += -lrte_table\n-endif\n-\n-ifeq ($(CONFIG_RTE_LIBRTE_PORT),y)\n-LDLIBS += -lrte_port\n-endif\n-\n-ifeq ($(CONFIG_RTE_LIBRTE_TIMER),y)\n-LDLIBS += -lrte_timer\n-endif\n-\n-ifeq ($(CONFIG_RTE_LIBRTE_HASH),y)\n-LDLIBS += -lrte_hash\n-endif\n-\n-ifeq ($(CONFIG_RTE_LIBRTE_JOBSTATS),y)\n-LDLIBS += -lrte_jobstats\n-endif\n-\n-ifeq ($(CONFIG_RTE_LIBRTE_LPM),y)\n-LDLIBS += -lrte_lpm\n-endif\n-\n-ifeq ($(CONFIG_RTE_LIBRTE_POWER),y)\n-LDLIBS += -lrte_power\n-endif\n-\n-ifeq ($(CONFIG_RTE_LIBRTE_ACL),y)\n-LDLIBS += -lrte_acl\n-endif\n-\n-ifeq ($(CONFIG_RTE_LIBRTE_METER),y)\n-LDLIBS += -lrte_meter\n-endif\n-\n-ifeq ($(CONFIG_RTE_LIBRTE_SCHED),y)\n-LDLIBS += -lrte_sched\n-LDLIBS += -lm\n-LDLIBS += -lrt\n-endif\n-\n-ifeq ($(CONFIG_RTE_LIBRTE_VHOST), y)\n-LDLIBS += -lrte_vhost\n-endif\n+_LDLIBS-$(CONFIG_RTE_LIBRTE_VHOST) += -lrte_vhost\n \n endif # ! CONFIG_RTE_BUILD_COMBINE_LIBS\n \n-ifeq ($(CONFIG_RTE_LIBRTE_PMD_PCAP),y)\n-LDLIBS += -lpcap\n-endif\n+_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_PCAP) += -lpcap\n \n-ifeq ($(CONFIG_RTE_LIBRTE_VHOST)$(CONFIG_RTE_LIBRTE_VHOST_USER),yn)\n-LDLIBS += -lfuse\n+ifeq ($(CONFIG_RTE_LIBRTE_VHOST_USER),n)\n+_LDLIBS-$(CONFIG_RTE_LIBRTE_VHOST) += -lfuse\n endif\n \n-ifeq ($(CONFIG_RTE_LIBRTE_MLX4_PMD),y)\n-LDLIBS += -libverbs\n-endif\n+_LDLIBS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += -libverbs\n \n-LDLIBS += --start-group\n+_LDLIBS-y += --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-\n-ifeq ($(CONFIG_RTE_LIBRTE_MBUF),y)\n-LDLIBS += -lrte_mbuf\n-endif\n-\n-ifeq ($(CONFIG_RTE_LIBRTE_IP_FRAG),y)\n-LDLIBS += -lrte_ip_frag\n-endif\n-\n-ifeq ($(CONFIG_RTE_LIBRTE_ETHER),y)\n-LDLIBS += -lethdev\n-endif\n-\n-ifeq ($(CONFIG_RTE_LIBRTE_MALLOC),y)\n-LDLIBS += -lrte_malloc\n-endif\n-\n-ifeq ($(CONFIG_RTE_LIBRTE_MEMPOOL),y)\n-LDLIBS += -lrte_mempool\n-endif\n-\n-ifeq ($(CONFIG_RTE_LIBRTE_RING),y)\n-LDLIBS += -lrte_ring\n-endif\n-\n-ifeq ($(CONFIG_RTE_LIBRTE_EAL),y)\n-LDLIBS += -lrte_eal\n-endif\n-\n-ifeq ($(CONFIG_RTE_LIBRTE_CMDLINE),y)\n-LDLIBS += -lrte_cmdline\n-endif\n-\n-ifeq ($(CONFIG_RTE_LIBRTE_CFGFILE),y)\n-LDLIBS += -lrte_cfgfile\n-endif\n-\n-ifeq ($(CONFIG_RTE_LIBRTE_PMD_BOND),y)\n-LDLIBS += -lrte_pmd_bond\n-endif\n-\n-ifeq ($(CONFIG_RTE_LIBRTE_PMD_XENVIRT),y)\n-LDLIBS += -lrte_pmd_xenvirt\n-LDLIBS += -lxenstore\n-endif\n+_LDLIBS-$(CONFIG_RTE_LIBRTE_KVARGS) += -lrte_kvargs\n+_LDLIBS-$(CONFIG_RTE_LIBRTE_MBUF) += -lrte_mbuf\n+_LDLIBS-$(CONFIG_RTE_LIBRTE_IP_FRAG) += -lrte_ip_frag\n+_LDLIBS-$(CONFIG_RTE_LIBRTE_ETHER) += -lethdev\n+_LDLIBS-$(CONFIG_RTE_LIBRTE_MALLOC) += -lrte_malloc\n+_LDLIBS-$(CONFIG_RTE_LIBRTE_MEMPOOL) += -lrte_mempool\n+_LDLIBS-$(CONFIG_RTE_LIBRTE_RING) += -lrte_ring\n+_LDLIBS-$(CONFIG_RTE_LIBRTE_EAL) += -lrte_eal\n+_LDLIBS-$(CONFIG_RTE_LIBRTE_CMDLINE) += -lrte_cmdline\n+_LDLIBS-$(CONFIG_RTE_LIBRTE_CFGFILE) += -lrte_cfgfile\n+_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += -lrte_pmd_bond\n+\n+_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_XENVIRT) += -lrte_pmd_xenvirt\n+_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_XENVIRT) += -lxenstore\n \n ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),n)\n # plugins (link only if static libraries)\n \n-ifeq ($(CONFIG_RTE_LIBRTE_VMXNET3_PMD),y)\n-LDLIBS += -lrte_pmd_vmxnet3_uio\n-endif\n-\n-ifeq ($(CONFIG_RTE_LIBRTE_VIRTIO_PMD),y)\n-LDLIBS += -lrte_pmd_virtio\n-endif\n-\n-ifeq ($(CONFIG_RTE_LIBRTE_ENIC_PMD),y)\n-LDLIBS += -lrte_pmd_enic\n-endif\n-\n-ifeq ($(CONFIG_RTE_LIBRTE_I40E_PMD),y)\n-LDLIBS += -lrte_pmd_i40e\n-endif\n-\n-ifeq ($(CONFIG_RTE_LIBRTE_FM10K_PMD),y)\n-LDLIBS += -lrte_pmd_fm10k\n-endif\n-\n-ifeq ($(CONFIG_RTE_LIBRTE_IXGBE_PMD),y)\n-LDLIBS += -lrte_pmd_ixgbe\n-endif\n-\n-ifeq ($(CONFIG_RTE_LIBRTE_E1000_PMD),y)\n-LDLIBS += -lrte_pmd_e1000\n-endif\n-\n-ifeq ($(CONFIG_RTE_LIBRTE_MLX4_PMD),y)\n-LDLIBS += -lrte_pmd_mlx4\n-endif\n-\n-ifeq ($(CONFIG_RTE_LIBRTE_PMD_RING),y)\n-LDLIBS += -lrte_pmd_ring\n-endif\n-\n-ifeq ($(CONFIG_RTE_LIBRTE_PMD_PCAP),y)\n-LDLIBS += -lrte_pmd_pcap\n-endif\n-\n-ifeq ($(CONFIG_RTE_LIBRTE_PMD_AF_PACKET),y)\n-LDLIBS += -lrte_pmd_af_packet\n-endif\n-\n-ifeq ($(CONFIG_RTE_LIBRTE_PMD_NULL),y)\n-LDLIBS += -lrte_pmd_null\n-endif\n-\n-endif # plugins\n+_LDLIBS-$(CONFIG_RTE_LIBRTE_VMXNET3_PMD) += -lrte_pmd_vmxnet3_uio\n+_LDLIBS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += -lrte_pmd_virtio\n+_LDLIBS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += -lrte_pmd_enic\n+_LDLIBS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += -lrte_pmd_i40e\n+_LDLIBS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += -lrte_pmd_fm10k\n+_LDLIBS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += -lrte_pmd_ixgbe\n+_LDLIBS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += -lrte_pmd_e1000\n+_LDLIBS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += -lrte_pmd_mlx4\n+_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_RING) += -lrte_pmd_ring\n+_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_PCAP) += -lrte_pmd_pcap\n+_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_AF_PACKET) += -lrte_pmd_af_packet\n+_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_NULL) += -lrte_pmd_null\n+\n+endif # ! $(CONFIG_RTE_BUILD_SHARED_LIB)\n \n endif # ! CONFIG_RTE_BUILD_COMBINE_LIBS\n \n-LDLIBS += $(EXECENV_LDLIBS)\n-\n-LDLIBS += --end-group\n-\n-LDLIBS += --no-whole-archive\n+_LDLIBS-y += $(EXECENV_LDLIBS)\n+_LDLIBS-y += --end-group\n+_LDLIBS-y += --no-whole-archive\n \n-LDLIBS += $(CPU_LDLIBS)\n+LDLIBS += $(_LDLIBS-y) $(CPU_LDLIBS)\n \n .PHONY: all\n all: install\n", "prefixes": [ "dpdk-dev", "v10", "1/2" ] }{ "id": 4726, "url": "