Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/10780/?format=api
{ "id": 10780, "url": "http://patches.dpdk.org/api/patches/10780/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1456266011-23701-1-git-send-email-thomas.monjalon@6wind.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": "<1456266011-23701-1-git-send-email-thomas.monjalon@6wind.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1456266011-23701-1-git-send-email-thomas.monjalon@6wind.com", "date": "2016-02-23T22:20:11", "name": "[dpdk-dev,v2] mk: replace the combined library with a linker script", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "02aba3c84778db0fb65fedfbb86495b1486f0174", "submitter": { "id": 1, "url": "http://patches.dpdk.org/api/people/1/?format=api", "name": "Thomas Monjalon", "email": "thomas.monjalon@6wind.com" }, "delegate": { "id": 1, "url": "http://patches.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/1456266011-23701-1-git-send-email-thomas.monjalon@6wind.com/mbox/", "series": [], "comments": "http://patches.dpdk.org/api/patches/10780/comments/", "check": "pending", "checks": "http://patches.dpdk.org/api/patches/10780/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 C72992A5B;\n\tTue, 23 Feb 2016 23:21:51 +0100 (CET)", "from mail-wm0-f44.google.com (mail-wm0-f44.google.com\n\t[74.125.82.44]) by dpdk.org (Postfix) with ESMTP id D55182956\n\tfor <dev@dpdk.org>; Tue, 23 Feb 2016 23:21:50 +0100 (CET)", "by mail-wm0-f44.google.com with SMTP id g62so4605901wme.0\n\tfor <dev@dpdk.org>; Tue, 23 Feb 2016 14:21:50 -0800 (PST)", "from XPS13.localdomain (171.36.101.84.rev.sfr.net. [84.101.36.171])\n\tby smtp.gmail.com with ESMTPSA id\n\tj10sm662502wjb.46.2016.02.23.14.21.48\n\t(version=TLSv1/SSLv3 cipher=OTHER);\n\tTue, 23 Feb 2016 14:21:49 -0800 (PST)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=6wind-com.20150623.gappssmtp.com; s=20150623;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=bZRaTs4+o2Ln5VnVqaJJOCDJSupZQe9d8QoOPk7aUXU=;\n\tb=sGiou5zTcrY6GS1/hKFyOEt76xib3RgtnltVOlpCaeHh4LvcvhgkX9v5in3sFns27k\n\tZjnNV6kJqnduFqW4sejqPL6BkspRK23WpBE0vJpPC96/Sr5qz7ihFepw6HBL7RhswpY3\n\ta7hOXbd50dHZlSIwMmFgFO8fa85H7cA6iW902Dj394LVZChoVwe9PmzibUMGnzBZ3Bth\n\tnrb/I2LkVZZhNCKOHBU5NWcyhjw3ecvsANY4qhQX0z2HZSxU4+yKWYUVugeEgdALnDIj\n\tiqVwwZgTc5ws1KRn7gv1e0UG3nQHOK8+YcqKMkk15JKB8V/9rKdmQHOFr5tICOSWokfJ\n\t6S9Q==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20130820;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=bZRaTs4+o2Ln5VnVqaJJOCDJSupZQe9d8QoOPk7aUXU=;\n\tb=Dtg+JGif9ZVEFB9BvcRSFkCMOhWSwBOmqSLuQES68qBnpawCcdaQeWVFXGWcNTehlF\n\t9ZWuzMXfeHark3TO/bYAPC2Xxn6nE2llNrG9JmhrVc8Ven5pkyBoUGGUfFiKdLUj4kEr\n\ttnETin/IuwfBJXWgXM0yyVmnJRxFLnKexgBsb9UfmS0p97MEuT6OgMCkbVawCi2qUo21\n\tFRyY/wYsPeZCbs1YdxGogooaRNxdbD1KmF0U1CDb5mQrmiqJfiUTubpa1dG0okXRvBA1\n\txDZDbKX8UiAn8URlzRfyFhHrrpzzQCBZMQzyTdjM2ckdxsnDnhKOwct473PSOPfgq5jX\n\ty+qA==", "X-Gm-Message-State": "AG10YOQpHsnxRdRvg0hculOTamzbwWHYLAkVnOeu4t0rmtKOimLfJ+ErGz5F0OtbjjSKADKd", "X-Received": "by 10.194.91.205 with SMTP id\n\tcg13mr35321114wjb.166.1456266110632; \n\tTue, 23 Feb 2016 14:21:50 -0800 (PST)", "From": "Thomas Monjalon <thomas.monjalon@6wind.com>", "To": "pmatilai@redhat.com", "Date": "Tue, 23 Feb 2016 23:20:11 +0100", "Message-Id": "<1456266011-23701-1-git-send-email-thomas.monjalon@6wind.com>", "X-Mailer": "git-send-email 2.7.0", "In-Reply-To": "<079fa1cfc3550c8147ea8b137fa1bc0f34d051dc.1448375477.git.pmatilai@redhat.com>", "References": "<079fa1cfc3550c8147ea8b137fa1bc0f34d051dc.1448375477.git.pmatilai@redhat.com>", "Cc": "dev@dpdk.org", "Subject": "[dpdk-dev] [PATCH v2] mk: replace the combined library with a\n\tlinker script", "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": "From: Panu Matilainen <pmatilai@redhat.com>\n\nThe physically linked-together combined library has been an increasing\nsource of problems, as was predicted when library and symbol versioning\nwas introduced. Replace the complex and fragile construction with a\nsimple linker script which achieves the same without all the problems,\nremove the related kludges from eg mlx drivers.\n\nSince creating the linker script is practically zero cost, remove the\nconfig option and just create it always.\n\nBased on a patch by Sergio Gonzales Monroy, linker script approach\ninitially suggested by Neil Horman.\n\nSuggested-by: Sergio Gonzalez Monroy <sergio.gonzalez.monroy@intel.com>\nSuggested-by: Neil Horman <nhorman@tuxdriver.com>\nSigned-off-by: Panu Matilainen <pmatilai@redhat.com>\nSigned-off-by: Thomas Monjalon <thomas.monjalon@6wind.com>\n---\nv2:\n- move RTE_LIBNAME assignment rte.vars.mk to rte.combinedlib.mk\n- update crypto\n- update doc\n- update rte.app.mk\n- update test-build.sh\n\n config/common_bsdapp | 5 --\n config/common_linuxapp | 5 --\n doc/guides/contributing/patches.rst | 12 ++-\n doc/guides/nics/mlx4.rst | 5 --\n doc/guides/nics/mlx5.rst | 5 --\n drivers/crypto/Makefile | 3 +-\n drivers/net/Makefile | 1 -\n drivers/net/mlx4/Makefile | 6 --\n drivers/net/mlx5/Makefile | 6 --\n lib/Makefile | 1 -\n mk/rte.app.mk | 17 +---\n drivers/crypto/Makefile => mk/rte.combinedlib.mk | 28 +++++-\n mk/rte.lib.mk | 16 ----\n mk/rte.sdkbuild.mk | 4 +-\n mk/rte.sharelib.mk | 105 -----------------------\n mk/rte.vars.mk | 2 -\n scripts/test-build.sh | 7 +-\n 17 files changed, 36 insertions(+), 192 deletions(-)\n copy drivers/crypto/Makefile => mk/rte.combinedlib.mk (81%)\n delete mode 100644 mk/rte.sharelib.mk", "diff": "diff --git a/config/common_bsdapp b/config/common_bsdapp\nindex 696382c..7df5ac6 100644\n--- a/config/common_bsdapp\n+++ b/config/common_bsdapp\n@@ -74,11 +74,6 @@ CONFIG_RTE_ARCH_STRICT_ALIGN=n\n CONFIG_RTE_BUILD_SHARED_LIB=n\n \n #\n-# Combine to one single library\n-#\n-CONFIG_RTE_BUILD_COMBINE_LIBS=n\n-\n-#\n # Use newest code breaking previous ABI\n #\n CONFIG_RTE_NEXT_ABI=y\ndiff --git a/config/common_linuxapp b/config/common_linuxapp\nindex f1638db..26df137 100644\n--- a/config/common_linuxapp\n+++ b/config/common_linuxapp\n@@ -74,11 +74,6 @@ CONFIG_RTE_ARCH_STRICT_ALIGN=n\n CONFIG_RTE_BUILD_SHARED_LIB=n\n \n #\n-# Combine to one single library\n-#\n-CONFIG_RTE_BUILD_COMBINE_LIBS=n\n-\n-#\n # Use newest code breaking previous ABI\n #\n CONFIG_RTE_NEXT_ABI=y\ndiff --git a/doc/guides/contributing/patches.rst b/doc/guides/contributing/patches.rst\nindex 5dd8f79..3ebe95b 100644\n--- a/doc/guides/contributing/patches.rst\n+++ b/doc/guides/contributing/patches.rst\n@@ -267,7 +267,7 @@ Checking Compilation\n Compilation of patches and changes should be tested using the the ``test-build.sh`` script in the ``scripts``\n directory of the DPDK repo::\n \n- scripts/test-build.sh x86_64-native-linuxapp-gcc+next+shared+combined\n+ scripts/test-build.sh x86_64-native-linuxapp-gcc+next+shared\n \n The script usage is::\n \n@@ -283,10 +283,8 @@ Where:\n Examples of configs are::\n \n x86_64-native-linuxapp-gcc\n- x86_64-native-linuxapp-gcc+next+shared+combined\n- x86_64-native-linuxapp-gcc+shared+next\n- x86_64-native-linuxapp-clang+shared+combined\n- i686-native-linuxapp-gcc+combined\n+ x86_64-native-linuxapp-gcc+next+shared\n+ x86_64-native-linuxapp-clang+shared\n \n The builds can be modifies via the following environmental variables:\n \n@@ -302,8 +300,8 @@ These can be set from the command line or in the config files shown above in the\n The recommended configurations and options to test compilation prior to submitting patches are::\n \n x86_64-native-linuxapp-gcc+shared+next\n- x86_64-native-linuxapp-clang+shared+combined\n- i686-native-linuxapp-gcc+combined\n+ x86_64-native-linuxapp-clang+shared\n+ i686-native-linuxapp-gcc\n \n export DPDK_DEP_ZLIB=y\n export DPDK_DEP_PCAP=y\ndiff --git a/doc/guides/nics/mlx4.rst b/doc/guides/nics/mlx4.rst\nindex 7757013..49f4626 100644\n--- a/doc/guides/nics/mlx4.rst\n+++ b/doc/guides/nics/mlx4.rst\n@@ -47,11 +47,6 @@ There is also a `section dedicated to this poll mode driver\n be enabled manually by setting ``CONFIG_RTE_LIBRTE_MLX4_PMD=y`` and\n recompiling DPDK.\n \n-.. warning::\n-\n- ``CONFIG_RTE_BUILD_COMBINE_LIBS`` with ``CONFIG_RTE_BUILD_SHARED_LIB``\n- is not supported and thus the compilation will fail with this configuration.\n-\n Implementation details\n ----------------------\n \ndiff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst\nindex b2a12ce..66794e6 100644\n--- a/doc/guides/nics/mlx5.rst\n+++ b/doc/guides/nics/mlx5.rst\n@@ -48,11 +48,6 @@ There is also a `section dedicated to this poll mode driver\n be enabled manually by setting ``CONFIG_RTE_LIBRTE_MLX5_PMD=y`` and\n recompiling DPDK.\n \n-.. warning::\n-\n- ``CONFIG_RTE_BUILD_COMBINE_LIBS`` with ``CONFIG_RTE_BUILD_SHARED_LIB``\n- is not supported and thus the compilation will fail with this configuration.\n-\n Implementation details\n ----------------------\n \ndiff --git a/drivers/crypto/Makefile b/drivers/crypto/Makefile\nindex d07ee96..d0258da 100644\n--- a/drivers/crypto/Makefile\n+++ b/drivers/crypto/Makefile\n@@ -34,5 +34,4 @@ include $(RTE_SDK)/mk/rte.vars.mk\n DIRS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_MB) += aesni_mb\n DIRS-$(CONFIG_RTE_LIBRTE_PMD_QAT) += qat\n \n-include $(RTE_SDK)/mk/rte.sharelib.mk\n-include $(RTE_SDK)/mk/rte.subdir.mk\n\\ No newline at end of file\n+include $(RTE_SDK)/mk/rte.subdir.mk\ndiff --git a/drivers/net/Makefile b/drivers/net/Makefile\nindex 6e4497e..0c3393f 100644\n--- a/drivers/net/Makefile\n+++ b/drivers/net/Makefile\n@@ -52,5 +52,4 @@ DIRS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio\n DIRS-$(CONFIG_RTE_LIBRTE_VMXNET3_PMD) += vmxnet3\n DIRS-$(CONFIG_RTE_LIBRTE_PMD_XENVIRT) += xenvirt\n \n-include $(RTE_SDK)/mk/rte.sharelib.mk\n include $(RTE_SDK)/mk/rte.subdir.mk\ndiff --git a/drivers/net/mlx4/Makefile b/drivers/net/mlx4/Makefile\nindex 23b766d..d2f5692 100644\n--- a/drivers/net/mlx4/Makefile\n+++ b/drivers/net/mlx4/Makefile\n@@ -31,12 +31,6 @@\n \n include $(RTE_SDK)/mk/rte.vars.mk\n \n-ifeq ($(CONFIG_RTE_BUILD_COMBINE_LIBS)$(CONFIG_RTE_BUILD_SHARED_LIB),yy)\n-all:\n-\t@echo 'MLX4: Not supported in a combined shared library'\n-\t@false\n-endif\n-\n # Library name.\n LIB = librte_pmd_mlx4.a\n \ndiff --git a/drivers/net/mlx5/Makefile b/drivers/net/mlx5/Makefile\nindex ae568e6..736d205 100644\n--- a/drivers/net/mlx5/Makefile\n+++ b/drivers/net/mlx5/Makefile\n@@ -31,12 +31,6 @@\n \n include $(RTE_SDK)/mk/rte.vars.mk\n \n-ifeq ($(CONFIG_RTE_BUILD_COMBINE_LIBS)$(CONFIG_RTE_BUILD_SHARED_LIB),yy)\n-all:\n-\t@echo 'MLX5: Not supported in a combined shared library'\n-\t@false\n-endif\n-\n # Library name.\n LIB = librte_pmd_mlx5.a\n \ndiff --git a/lib/Makefile b/lib/Makefile\nindex ef172ea..6840f87 100644\n--- a/lib/Makefile\n+++ b/lib/Makefile\n@@ -64,5 +64,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 8ecab41..daac09f 100644\n--- a/mk/rte.app.mk\n+++ b/mk/rte.app.mk\n@@ -59,10 +59,6 @@ _LDLIBS-y += -L$(RTE_SDK_BIN)/lib\n \n _LDLIBS-y += --whole-archive\n \n-_LDLIBS-$(CONFIG_RTE_BUILD_COMBINE_LIBS) += -l$(RTE_LIBNAME)\n-\n-ifeq ($(CONFIG_RTE_BUILD_COMBINE_LIBS),n)\n-\n _LDLIBS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += -lrte_distributor\n _LDLIBS-$(CONFIG_RTE_LIBRTE_REORDER) += -lrte_reorder\n \n@@ -88,8 +84,6 @@ _LDLIBS-$(CONFIG_RTE_LIBRTE_SCHED) += -lrt\n \n _LDLIBS-$(CONFIG_RTE_LIBRTE_VHOST) += -lrte_vhost\n \n-endif # ! CONFIG_RTE_BUILD_COMBINE_LIBS\n-\n ifeq ($(CONFIG_RTE_LIBRTE_VHOST_NUMA),y)\n _LDLIBS-$(CONFIG_RTE_LIBRTE_VHOST) += -lnuma\n endif\n@@ -99,9 +93,8 @@ _LDLIBS-$(CONFIG_RTE_LIBRTE_VHOST) += -lfuse\n endif\n \n # The static libraries do not know their dependencies.\n-# The combined library fails also to store this information.\n-# So linking with static or combined library requires explicit dependencies.\n-ifneq ($(CONFIG_RTE_BUILD_COMBINE_LIBS)$(CONFIG_RTE_BUILD_SHARED_LIB),ny)\n+# So linking with static library requires explicit dependencies.\n+ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),n)\n _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_PCAP) += -lpcap\n _LDLIBS-$(CONFIG_RTE_LIBRTE_BNX2X_PMD) += -lz\n _LDLIBS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += -libverbs\n@@ -111,12 +104,10 @@ _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_XENVIRT) += -lxenstore\n _LDLIBS-$(CONFIG_RTE_LIBRTE_MPIPE_PMD) += -lgxio\n # QAT PMD has a dependency on libcrypto (from openssl) for calculating HMAC precomputes\n _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_QAT) += -lcrypto\n-endif # CONFIG_RTE_BUILD_COMBINE_LIBS or not CONFIG_RTE_BUILD_SHARED_LIBS\n+endif # !CONFIG_RTE_BUILD_SHARED_LIBS\n \n _LDLIBS-y += --start-group\n \n-ifeq ($(CONFIG_RTE_BUILD_COMBINE_LIBS),n)\n-\n _LDLIBS-$(CONFIG_RTE_LIBRTE_KVARGS) += -lrte_kvargs\n _LDLIBS-$(CONFIG_RTE_LIBRTE_MBUF) += -lrte_mbuf\n _LDLIBS-$(CONFIG_RTE_LIBRTE_MBUF_OFFLOAD) += -lrte_mbuf_offload\n@@ -161,8 +152,6 @@ _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_MB) += -L$(AESNI_MULTI_BUFFER_LIB_PATH)\n \n endif # ! $(CONFIG_RTE_BUILD_SHARED_LIB)\n \n-endif # ! CONFIG_RTE_BUILD_COMBINE_LIBS\n-\n _LDLIBS-y += $(EXECENV_LDLIBS)\n _LDLIBS-y += --end-group\n _LDLIBS-y += --no-whole-archive\ndiff --git a/drivers/crypto/Makefile b/mk/rte.combinedlib.mk\nsimilarity index 81%\ncopy from drivers/crypto/Makefile\ncopy to mk/rte.combinedlib.mk\nindex d07ee96..fe4817b 100644\n--- a/drivers/crypto/Makefile\n+++ b/mk/rte.combinedlib.mk\n@@ -31,8 +31,28 @@\n \n include $(RTE_SDK)/mk/rte.vars.mk\n \n-DIRS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_MB) += aesni_mb\n-DIRS-$(CONFIG_RTE_LIBRTE_PMD_QAT) += qat\n+default: all\n \n-include $(RTE_SDK)/mk/rte.sharelib.mk\n-include $(RTE_SDK)/mk/rte.subdir.mk\n\\ No newline at end of file\n+ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y)\n+EXT:=.so\n+else\n+EXT:=.a\n+endif\n+\n+RTE_LIBNAME := dpdk\n+COMBINEDLIB := lib$(RTE_LIBNAME)$(EXT)\n+\n+LIBS := $(notdir $(wildcard $(RTE_OUTPUT)/lib/*$(EXT)))\n+\n+all: FORCE\n+\t$(Q)echo \"GROUP ( $(LIBS) )\" > $(RTE_OUTPUT)/lib/$(COMBINEDLIB)\n+\n+#\n+# Clean all generated files\n+#\n+.PHONY: clean\n+clean:\n+\t$(Q)rm -f $(RTE_OUTPUT)/lib/$(COMBINEDLIB)\n+\n+.PHONY: FORCE\n+FORCE:\ndiff --git a/mk/rte.lib.mk b/mk/rte.lib.mk\nindex 24c81e7..8f7e021 100644\n--- a/mk/rte.lib.mk\n+++ b/mk/rte.lib.mk\n@@ -138,14 +138,6 @@ endif\n \t\t$(depfile_newer)),\\\n \t\t$(O_TO_S_DO))\n \n-ifeq ($(CONFIG_RTE_BUILD_COMBINE_LIBS)$(EXTLIB_BUILD),yn)\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@@ -161,14 +153,6 @@ $(LIB): $(OBJS-y) $(DEP_$(LIB)) FORCE\n \t $(depfile_missing),\\\n \t $(depfile_newer)),\\\n \t $(O_TO_A_DO))\n-ifeq ($(CONFIG_RTE_BUILD_COMBINE_LIBS)$(EXTLIB_BUILD),yn)\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 85f603c..eec5241 100644\n--- a/mk/rte.sdkbuild.mk\n+++ b/mk/rte.sdkbuild.mk\n@@ -77,8 +77,8 @@ $(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 [ $@ = drivers -a $(CONFIG_RTE_BUILD_COMBINE_LIBS) = y ]; then \\\n-\t\t$(MAKE) -f $(RTE_SDK)/lib/Makefile sharelib; \\\n+\t@if [ $@ = drivers ]; then \\\n+\t\t$(MAKE) -f $(RTE_SDK)/mk/rte.combinedlib.mk; \\\n \tfi\n \n %_clean:\ndiff --git a/mk/rte.sharelib.mk b/mk/rte.sharelib.mk\ndeleted file mode 100644\nindex 70c49a8..0000000\n--- a/mk/rte.sharelib.mk\n+++ /dev/null\n@@ -1,105 +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 ($(CONFIG_RTE_BUILD_COMBINE_LIBS),y)\n-ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y)\n-LIB_ONE := lib$(RTE_LIBNAME).so\n-else\n-LIB_ONE := lib$(RTE_LIBNAME).a\n-endif\n-COMBINED_MAP=$(BUILDDIR)/lib/libdpdk.map\n-COMBINED_LDFLAGS += --version-script=$(COMBINED_MAP)\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 $(call linkerprefix,$(COMBINED_LDFLAGS)) \\\n-\t-shared $(OBJS) -o $(RTE_OUTPUT)/lib/$(LIB_ONE)\n-else\n-O_TO_S = $(LD) $(CPU_LDFLAGS) $(COMBINED_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 ($(CONFIG_RTE_BUILD_COMBINE_LIBS),y)\n-ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y)\n-$(LIB_ONE): FORCE\n-\t@[ -d $(dir $@) ] || mkdir -p $(dir $@)\n-\t@$(SRCDIR)/scripts/merge-maps.sh > $(COMBINED_MAP)\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 7e7ee14..2d734bd 100644\n--- a/mk/rte.vars.mk\n+++ b/mk/rte.vars.mk\n@@ -66,8 +66,6 @@ endif\n \n RTE_TARGET ?= $(RTE_ARCH)-$(RTE_MACHINE)-$(RTE_EXEC_ENV)-$(RTE_TOOLCHAIN)\n \n-RTE_LIBNAME := dpdk\n-\n ifeq ($(BUILDING_RTE_SDK),)\n # if we are building an external app/lib, include internal/rte.extvars.mk that will\n # define RTE_OUTPUT, RTE_SRCDIR, RTE_EXTMK, RTE_SDK_BIN, (etc ...)\ndiff --git a/scripts/test-build.sh b/scripts/test-build.sh\nindex 6d28c5d..ead7b47 100755\n--- a/scripts/test-build.sh\n+++ b/scripts/test-build.sh\n@@ -55,7 +55,7 @@ print_help () {\n \t -s short test with only first config without examples/doc\n \n \tconfig: defconfig name followed by switches delimited with \"+\" sign\n-\t Example: x86_64-native-linuxapp-gcc+next+shared+combined\n+\t Example: x86_64-native-linuxapp-gcc+next+shared\n \t Default is to enable most of the options.\n \t The external dependencies are setup with DPDK_DEP_* variables.\n \tEND_OF_HELP\n@@ -101,8 +101,6 @@ config () # <directory> <target> <options>\n \t\tsed -ri 's,(NEXT_ABI=)y,\\1n,' $1/.config\n \t\t! echo $3 | grep -q shared || \\\n \t\tsed -ri 's,(SHARED_LIB=)n,\\1y,' $1/.config\n-\t\t! echo $3 | grep -q combined || \\\n-\t\tsed -ri 's,(COMBINE_LIBS=)n,\\1y,' $1/.config\n \t\techo $2 | grep -q '^i686' || \\\n \t\tsed -ri 's,(NUMA=)n,\\1y,' $1/.config\n \t\tsed -ri 's,(PCI_CONFIG=)n,\\1y,' $1/.config\n@@ -110,7 +108,6 @@ config () # <directory> <target> <options>\n \t\tsed -ri 's,(BYPASS=)n,\\1y,' $1/.config\n \t\ttest \"$DPDK_DEP_MOFED\" != y || \\\n \t\techo $2 | grep -q '^clang$' || \\\n-\t\techo $3 | grep -q 'shared.*combined' || \\\n \t\tsed -ri 's,(MLX._PMD=)n,\\1y,' $1/.config\n \t\ttest \"$DPDK_DEP_SZE\" != y || \\\n \t\techo $2 | grep -q '^i686' || \\\n@@ -122,11 +119,9 @@ config () # <directory> <target> <options>\n \t\tsed -ri 's,(PCAP=)n,\\1y,' $1/.config\n \t\ttest -z \"$AESNI_MULTI_BUFFER_LIB_PATH\" || \\\n \t\techo $2 | grep -q '^i686' || \\\n-\t\techo $3 | grep -q 'shared.*combined' || \\\n \t\tsed -ri 's,(PMD_AESNI_MB=)n,\\1y,' $1/.config\n \t\ttest \"$DPDK_DEP_SSL\" != y || \\\n \t\techo $2 | grep -q '^i686' || \\\n-\t\techo $3 | grep -q 'shared.*combined' || \\\n \t\tsed -ri 's,(PMD_QAT=)n,\\1y,' $1/.config\n \t\tsed -ri 's,(KNI_VHOST.*=)n,\\1y,' $1/.config\n \t\tsed -ri 's,(SCHED_.*=)n,\\1y,' $1/.config\n", "prefixes": [ "dpdk-dev", "v2" ] }