From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id A72992C65 for ; Thu, 10 Mar 2016 14:16:17 +0100 (CET) Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id 31E79D9626; Thu, 10 Mar 2016 13:16:17 +0000 (UTC) Received: from sopuli.koti.laiskiainen.org.com (vpn1-4-209.ams2.redhat.com [10.36.4.209]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u2ADGEDr011158; Thu, 10 Mar 2016 08:16:16 -0500 From: Panu Matilainen To: dev@dpdk.org Date: Thu, 10 Mar 2016 15:15:59 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Thu, 10 Mar 2016 13:16:17 +0000 (UTC) Subject: [dpdk-dev] [PATCH v3 1/3] mk: clear up libm and librt linkage confusion 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: , X-List-Received-Date: Thu, 10 Mar 2016 13:16:17 -0000 There are two places that need -lm (test app and librte_sched) and exactly one that needs -lrt (librte_sched). Add the relevant DT_NEEDED entries to both, and eliminate the bogus discrepancy between Linux and BSD EXECENV_LDLIBS wrt these libs. Signed-off-by: Panu Matilainen --- app/test/Makefile | 2 ++ lib/librte_sched/Makefile | 3 +++ mk/exec-env/linuxapp/rte.vars.mk | 2 +- mk/rte.app.mk | 6 ++---- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app/test/Makefile b/app/test/Makefile index ec33e1a..00e4df2 100644 --- a/app/test/Makefile +++ b/app/test/Makefile @@ -160,6 +160,8 @@ CFLAGS += $(WERROR_FLAGS) CFLAGS += -D_GNU_SOURCE +LDLIBS += -lm + # Disable VTA for memcpy test ifeq ($(CC), gcc) ifeq ($(shell test $(GCC_VERSION) -ge 44 && echo 1), 1) diff --git a/lib/librte_sched/Makefile b/lib/librte_sched/Makefile index b1cb285..4d631f6 100644 --- a/lib/librte_sched/Makefile +++ b/lib/librte_sched/Makefile @@ -41,6 +41,9 @@ CFLAGS += $(WERROR_FLAGS) CFLAGS_rte_red.o := -D_GNU_SOURCE +LDLIBS += -lm +LDLIBS += -lrt + EXPORT_MAP := rte_sched_version.map LIBABIVER := 1 diff --git a/mk/exec-env/linuxapp/rte.vars.mk b/mk/exec-env/linuxapp/rte.vars.mk index 5fd7d85..d51bd17 100644 --- a/mk/exec-env/linuxapp/rte.vars.mk +++ b/mk/exec-env/linuxapp/rte.vars.mk @@ -48,7 +48,7 @@ endif # Workaround lack of DT_NEEDED entry EXECENV_LDFLAGS = --no-as-needed -EXECENV_LDLIBS = -lrt -lm +EXECENV_LDLIBS = EXECENV_ASFLAGS = ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) diff --git a/mk/rte.app.mk b/mk/rte.app.mk index daac09f..cadc7ab 100644 --- a/mk/rte.app.mk +++ b/mk/rte.app.mk @@ -77,11 +77,7 @@ _LDLIBS-$(CONFIG_RTE_LIBRTE_LPM) += -lrte_lpm _LDLIBS-$(CONFIG_RTE_LIBRTE_POWER) += -lrte_power _LDLIBS-$(CONFIG_RTE_LIBRTE_ACL) += -lrte_acl _LDLIBS-$(CONFIG_RTE_LIBRTE_METER) += -lrte_meter - _LDLIBS-$(CONFIG_RTE_LIBRTE_SCHED) += -lrte_sched -_LDLIBS-$(CONFIG_RTE_LIBRTE_SCHED) += -lm -_LDLIBS-$(CONFIG_RTE_LIBRTE_SCHED) += -lrt - _LDLIBS-$(CONFIG_RTE_LIBRTE_VHOST) += -lrte_vhost ifeq ($(CONFIG_RTE_LIBRTE_VHOST_NUMA),y) @@ -104,6 +100,8 @@ _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 +_LDLIBS-$(CONFIG_RTE_LIBRTE_SCHED) += -lm +_LDLIBS-$(CONFIG_RTE_LIBRTE_SCHED) += -lrt endif # !CONFIG_RTE_BUILD_SHARED_LIBS _LDLIBS-y += --start-group -- 2.5.0