From patchwork Mon Dec 7 10:36:36 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Panu Matilainen X-Patchwork-Id: 9380 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 6242C959B; Mon, 7 Dec 2015 11:36:44 +0100 (CET) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 2C3989596 for ; Mon, 7 Dec 2015 11:36:43 +0100 (CET) Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id 83E378E50E; Mon, 7 Dec 2015 10:36:42 +0000 (UTC) Received: from sopuli.koti.laiskiainen.org.com (vpn1-5-85.ams2.redhat.com [10.36.5.85]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id tB7AaeNF017967; Mon, 7 Dec 2015 05:36:41 -0500 From: Panu Matilainen To: dev@dpdk.org Date: Mon, 7 Dec 2015 12:36:36 +0200 Message-Id: X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 Subject: [dpdk-dev] [PATCH] mk: fix external shared library dependencies of drivers, round 2 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" Similar to commit 5f9115e58cc6f304ff4ade694cf5823d32887d1a, but for qat and mpipe drivers. The former did not exist when the previous patch was sent and latter I just missed. Fixes: 5f9115e58cc6 ("mk: fix shared library dependencies of drivers") Signed-off-by: Panu Matilainen --- drivers/crypto/qat/Makefile | 1 + drivers/net/mpipe/Makefile | 1 + mk/rte.app.mk | 8 +++++--- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/crypto/qat/Makefile b/drivers/crypto/qat/Makefile index e027ff9..258c2d5 100644 --- a/drivers/crypto/qat/Makefile +++ b/drivers/crypto/qat/Makefile @@ -41,6 +41,7 @@ CFLAGS += $(WERROR_FLAGS) # external library include paths CFLAGS += -I$(SRCDIR)/qat_adf +LDLIBS += -lcrypto # library source files SRCS-$(CONFIG_RTE_LIBRTE_PMD_QAT) += qat_crypto.c diff --git a/drivers/net/mpipe/Makefile b/drivers/net/mpipe/Makefile index 552b303..654d191 100644 --- a/drivers/net/mpipe/Makefile +++ b/drivers/net/mpipe/Makefile @@ -32,6 +32,7 @@ include $(RTE_SDK)/mk/rte.vars.mk LIB = librte_pmd_mpipe.a CFLAGS += $(WERROR_FLAGS) -O3 +LDLIBS += -gxio EXPORT_MAP := rte_pmd_mpipe_version.map diff --git a/mk/rte.app.mk b/mk/rte.app.mk index 90ec33d..856cac0 100644 --- a/mk/rte.app.mk +++ b/mk/rte.app.mk @@ -108,6 +108,9 @@ _LDLIBS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += -libverbs _LDLIBS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += -libverbs _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_SZEDATA2) += -lsze2 _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_XENVIRT) += -lxenstore +# QAT PMD has a dependency on libcrypto (from openssl) for calculating HMAC precomputes +_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_QAT) += -lcrypto +_LDLIBS-$(CONFIG_RTE_LIBRTE_MPIPE_PMD) += -lgxio endif # CONFIG_RTE_BUILD_COMBINE_LIBS or not CONFIG_RTE_BUILD_SHARED_LIBS _LDLIBS-y += --start-group @@ -144,14 +147,13 @@ _LDLIBS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += -lrte_pmd_e1000 _LDLIBS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += -lrte_pmd_mlx4 _LDLIBS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += -lrte_pmd_mlx5 _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_SZEDATA2) += -lrte_pmd_szedata2 -_LDLIBS-$(CONFIG_RTE_LIBRTE_MPIPE_PMD) += -lrte_pmd_mpipe -lgxio +_LDLIBS-$(CONFIG_RTE_LIBRTE_MPIPE_PMD) += -lrte_pmd_mpipe _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_RING) += -lrte_pmd_ring _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_PCAP) += -lrte_pmd_pcap _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_AF_PACKET) += -lrte_pmd_af_packet _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_NULL) += -lrte_pmd_null -# QAT PMD has a dependency on libcrypto (from openssl) for calculating HMAC precomputes -_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_QAT) += -lrte_pmd_qat -lcrypto +_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_QAT) += -lrte_pmd_qat # AESNI MULTI BUFFER is dependent on the IPSec_MB library _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_MB) += -lrte_pmd_aesni_mb