From eb54ef42b02f94c4093556fdd6b51e2d7fd0df47 Mon Sep 17 00:00:00 2001 From: Erik Gabriel Carrillo Date: Wed, 4 Apr 2018 16:51:09 -0500 Subject: [PATCH] mk: update timer library order in static build The introduction of the event timer adapter library adds a dependency on the rte_timer library from the rte_eventdev library. Update the order so that the timer library comes after the eventdev library in the linker command when statically linking applications. Signed-off-by: Erik Gabriel Carrillo Acked-by: Jerin Jacob --- lib/meson.build | 3 ++- mk/rte.app.mk | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/meson.build b/lib/meson.build index ef61591701..b1ad35fc64 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -13,13 +13,14 @@ libraries = [ 'compat', # just a header, used for versioning 'metrics', # bitrate/latency stats depends on this 'hash', # efd depends on this 'kvargs', # cryptodev depends on this + 'timer', # eventdev depends on this 'acl', 'bbdev', 'bitratestats', 'cfgfile', 'cmdline', 'cryptodev', 'distributor', 'efd', 'eventdev', 'gro', 'gso', 'ip_frag', 'jobstats', 'kni', 'latencystats', 'lpm', 'member', 'meter', 'power', 'pdump', - 'reorder', 'sched', 'security', 'timer', 'vhost', + 'reorder', 'sched', 'security', 'vhost', # add pkt framework libs which use other libs from above 'port', 'table', 'pipeline', # flow_classify lib depends on pkt framework table lib diff --git a/mk/rte.app.mk b/mk/rte.app.mk index 005803a567..8bab901fcf 100644 --- a/mk/rte.app.mk +++ b/mk/rte.app.mk @@ -80,7 +80,6 @@ _LDLIBS-$(CONFIG_RTE_LIBRTE_BITRATE) += -lrte_bitratestats _LDLIBS-$(CONFIG_RTE_LIBRTE_LATENCY_STATS) += -lrte_latencystats _LDLIBS-$(CONFIG_RTE_LIBRTE_POWER) += -lrte_power -_LDLIBS-$(CONFIG_RTE_LIBRTE_TIMER) += -lrte_timer _LDLIBS-$(CONFIG_RTE_LIBRTE_EFD) += -lrte_efd _LDLIBS-y += --whole-archive @@ -98,6 +97,7 @@ _LDLIBS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += -lrte_cryptodev _LDLIBS-$(CONFIG_RTE_LIBRTE_SECURITY) += -lrte_security _LDLIBS-$(CONFIG_RTE_LIBRTE_EVENTDEV) += -lrte_eventdev _LDLIBS-$(CONFIG_RTE_LIBRTE_RAWDEV) += -lrte_rawdev +_LDLIBS-$(CONFIG_RTE_LIBRTE_TIMER) += -lrte_timer _LDLIBS-$(CONFIG_RTE_LIBRTE_MEMPOOL) += -lrte_mempool _LDLIBS-$(CONFIG_RTE_DRIVER_MEMPOOL_RING) += -lrte_mempool_ring _LDLIBS-$(CONFIG_RTE_LIBRTE_RING) += -lrte_ring -- 2.20.1