From 3e718b8169bc36d9e87f8738000228678d07d2da Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Mon, 7 Dec 2015 12:45:36 +0200 Subject: [PATCH] mk: fix external shared library dependencies of drivers 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 Acked-by: Aaron Conole --- drivers/crypto/qat/Makefile | 1 + drivers/net/mpipe/Makefile | 1 + mk/rte.app.mk | 9 +++++---- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/crypto/qat/Makefile b/drivers/crypto/qat/Makefile index e027ff968f..258c2d5f28 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 552b303155..46f046d5ff 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 += -lgxio EXPORT_MAP := rte_pmd_mpipe_version.map diff --git a/mk/rte.app.mk b/mk/rte.app.mk index 90ec33dd0e..c4a2f49f8a 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 +_LDLIBS-$(CONFIG_RTE_LIBRTE_MPIPE_PMD) += -lgxio +# QAT PMD has a dependency on libcrypto (from openssl) for calculating HMAC precomputes +_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_QAT) += -lcrypto endif # CONFIG_RTE_BUILD_COMBINE_LIBS or not CONFIG_RTE_BUILD_SHARED_LIBS _LDLIBS-y += --start-group @@ -144,14 +147,12 @@ _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 -- 2.20.1