diff mbox series

[v2,06/37] examples/vm_power_manager: convert to use DPDK pkg-config

Message ID 20200820124140.13451-7-ciara.power@intel.com (mailing list archive)
State Superseded, archived
Delegated to: Thomas Monjalon
Headers show
Series remove make support in DPDK | expand


Context Check Description
ci/checkpatch warning coding style issues

Commit Message

Power, Ciara Aug. 20, 2020, 12:41 p.m. UTC
From: Bruce Richardson <bruce.richardson@intel.com>

Convert the build of the vm_power_manager app over to use DPDK from
pkg-config rather than using RTE_SDK/RTE_TARGET.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
 examples/vm_power_manager/Makefile | 74 ++++++++++++++----------------
 1 file changed, 35 insertions(+), 39 deletions(-)
diff mbox series


diff --git a/examples/vm_power_manager/Makefile b/examples/vm_power_manager/Makefile
index 65c2ad179e..87b9744d8c 100644
--- a/examples/vm_power_manager/Makefile
+++ b/examples/vm_power_manager/Makefile
@@ -1,65 +1,61 @@ 
 # SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
+# Copyright(c) 2010-2020 Intel Corporation
-ifneq ($(shell pkg-config --atleast-version=0.9.3 libvirt; echo $$?), 0)
-$(error vm_power_manager requires libvirt >= 0.9.3)
-ifeq ($(RTE_SDK),)
-$(error "Please define RTE_SDK environment variable")
+# Build using pkg-config variables if possible
+ifneq ($(shell pkg-config --exists libdpdk && echo 0),0)
+$(error "no installation of DPDK found")
-# Default target, detect a build directory, by looking for a path with a .config
-RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config)))))
-include $(RTE_SDK)/mk/rte.vars.mk
 # binary name
 APP = vm_power_mgr
 # all source are stored in SRCS-y
 SRCS-y := main.c vm_power_cli.c power_manager.c channel_manager.c
 SRCS-y += channel_monitor.c parse.c
-ifeq ($(CONFIG_RTE_ARCH_X86_64),y)
+ifeq ($(shell uname -m),x86_64)
 SRCS-y += oob_monitor_x86.c
 SRCS-y += oob_monitor_nop.c
-CFLAGS += -O3 -I$(RTE_SDK)/lib/librte_power/
+all: shared
+.PHONY: shared static
+shared: build/$(APP)-shared
+	ln -sf $(APP)-shared build/$(APP)
+static: build/$(APP)-static
+	ln -sf $(APP)-static build/$(APP)
-LDLIBS += -lvirt
+PKGCONF ?= pkg-config
-JANSSON := $(shell pkg-config --exists jansson; echo $$?)
-ifeq ($(JANSSON), 0)
-LDLIBS += $(shell pkg-config --libs jansson)
+PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null)
+CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)
+LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk)
+LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk)
-LDLIBS += -lrte_pmd_ixgbe
+ifneq ($(shell $(PKGCONF) --atleast-version=0.9.3 libvirt; echo $$?), 0)
+$(error vm_power_manager requires libvirt >= 0.9.3)
+LDFLAGS += $(shell $(PKGCONF) --libs libvirt)
-LDLIBS += -lrte_pmd_i40e
+JANSSON := $(shell $(PKGCONF) --exists jansson; echo $$?)
+ifeq ($(JANSSON), 0)
+LDFLAGS += $(shell $(PKGCONF) --libs jansson)
-LDLIBS += -lrte_pmd_bnxt
+# for shared library builds, we need to explicitly link these PMDs
+LDFLAGS_SHARED += -lrte_pmd_ixgbe -lrte_pmd_i40e -lrte_pmd_bnxt
+build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build
-# workaround for a gcc bug with noreturn attribute
-# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603
-CFLAGS_main.o += -Wno-return-type
+build/$(APP)-static: $(SRCS-y) Makefile $(PC_FILE) | build
-include $(RTE_SDK)/mk/rte.extapp.mk
+	@mkdir -p $@
-endif # libvirt check
+.PHONY: clean
+	rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared
+	test -d build && rmdir -p build || true