From patchwork Mon Mar 21 11:33:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Panu Matilainen X-Patchwork-Id: 11624 X-Patchwork-Delegate: thomas@monjalon.net 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 772602C65; Mon, 21 Mar 2016 12:34:35 +0100 (CET) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 8A2E12BCD for ; Mon, 21 Mar 2016 12:34:31 +0100 (CET) Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id 02C5B64381; Mon, 21 Mar 2016 11:34:31 +0000 (UTC) Received: from sopuli.koti.laiskiainen.org.com (vpn1-7-131.ams2.redhat.com [10.36.7.131]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u2LBYS6D031466; Mon, 21 Mar 2016 07:34:30 -0400 From: Panu Matilainen To: dev@dpdk.org Cc: ferruh.yigit@intel.com, thomas.monjalon@6wind.com Date: Mon, 21 Mar 2016 13:33:58 +0200 Message-Id: <27d49a881875edbfdacbf8f621d38c3927a95881.1458560038.git.pmatilai@redhat.com> In-Reply-To: <233492f10ac71dd9f6902eaa4bca425febc5d2c0.1458560038.git.pmatilai@redhat.com> References: <233492f10ac71dd9f6902eaa4bca425febc5d2c0.1458560038.git.pmatilai@redhat.com> In-Reply-To: <233492f10ac71dd9f6902eaa4bca425febc5d2c0.1458560038.git.pmatilai@redhat.com> References: <233492f10ac71dd9f6902eaa4bca425febc5d2c0.1458560038.git.pmatilai@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Mon, 21 Mar 2016 11:34:31 +0000 (UTC) Subject: [dpdk-dev] [PATCH 2/2] mk: fix two more missing libm dependencies 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" Commit e86a699cf6b1 missed two further libm dependencies: ceil() used by librte_meter is typically inlined so the missing dependency does not actually cause failures, and librte_pmd_nfp is not built by default so its easy to miss. This causes duplicates in LDLIBS in many configurations so its vital they are removed before passing to linker. Fixes: e86a699cf6b1 ("mk: fix shared library dependencies on libm and librt") Reported-by: Ferruh Yigit Signed-off-by: Panu Matilainen Tested-by: Ferruh Yigit --- drivers/net/nfp/Makefile | 2 ++ lib/librte_meter/Makefile | 2 ++ mk/rte.app.mk | 2 ++ 3 files changed, 6 insertions(+) diff --git a/drivers/net/nfp/Makefile b/drivers/net/nfp/Makefile index ef7a13d..1dddd1f 100644 --- a/drivers/net/nfp/Makefile +++ b/drivers/net/nfp/Makefile @@ -39,6 +39,8 @@ LIB = librte_pmd_nfp.a CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) +LDLIBS += -lm + EXPORT_MAP := rte_pmd_nfp_version.map LIBABIVER := 1 diff --git a/lib/librte_meter/Makefile b/lib/librte_meter/Makefile index 8765881..f07fced 100644 --- a/lib/librte_meter/Makefile +++ b/lib/librte_meter/Makefile @@ -39,6 +39,8 @@ LIB = librte_meter.a CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) +LDLIBS += -lm + EXPORT_MAP := rte_meter_version.map LIBABIVER := 1 diff --git a/mk/rte.app.mk b/mk/rte.app.mk index f4eb5e8..2f9bafe 100644 --- a/mk/rte.app.mk +++ b/mk/rte.app.mk @@ -85,6 +85,7 @@ _LDLIBS-$(CONFIG_RTE_LIBRTE_VHOST) += -lrte_vhost ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),n) _LDLIBS-$(CONFIG_RTE_LIBRTE_SCHED) += -lm _LDLIBS-$(CONFIG_RTE_LIBRTE_SCHED) += -lrt +_LDLIBS-$(CONFIG_RTE_LIBRTE_METER) += -lm ifeq ($(CONFIG_RTE_LIBRTE_VHOST_NUMA),y) _LDLIBS-$(CONFIG_RTE_LIBRTE_VHOST) += -lnuma endif @@ -101,6 +102,7 @@ _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 +_LDLIBS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += -lm # QAT / AESNI GCM PMDs are dependent on libcrypto (from openssl) # for calculating HMAC precomputes ifeq ($(CONFIG_RTE_LIBRTE_PMD_QAT),y)