From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 28C30A04AA; Tue, 8 Sep 2020 00:08:26 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id BE16E1C196; Tue, 8 Sep 2020 00:07:33 +0200 (CEST) Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) by dpdk.org (Postfix) with ESMTP id E408C1C129 for ; Tue, 8 Sep 2020 00:07:28 +0200 (CEST) Received: from compute7.internal (compute7.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id 961E95C002F; Mon, 7 Sep 2020 18:07:28 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute7.internal (MEProxy); Mon, 07 Sep 2020 18:07:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm2; bh=OQIlNjPBy9i3n sVce4/sitcvXHnkl1REzVKB6OCE3uM=; b=ruyJ+nusDhrYk1ulkXd9Bi5Wn/Naw S6MB7E+vS8iOpE8YOw37PIneJ356EeJH+K9yGoCh2ckki5j9BAKVYlSoYYcuh3xi OGwM/RdVh9u3399CEtGGgaBI6GriZ9KCgHA5+Rw3tDzUe9bO5IBz8avy4OafW9ij EQxNzkSJdzGg5WR623VRWu17me8J/R1tv5qWNI7VOJVSRFg3aVLn6QsMgZvY1f/L upLm+eyPPRymPasxWKq0OEfMujd97NU6zXM+bunX7VnIHK5ef5S2U25sjzqacPsX WI0Fjeam4tk4pOZuiKE6QfMsf6GS2eUBMQ1RKnrQC0sVD1qJgzRcwMvlQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; bh=OQIlNjPBy9i3nsVce4/sitcvXHnkl1REzVKB6OCE3uM=; b=cbHD14He 218qSWCQLfLMgk+iYXnKGiEAqPKun2WUrTqK2gxYEKCa6mZPc+UJ/Illlb1M2gy0 axKuT1aT+8I7pKNzKvS6zwUNhg8xgXF/lucY8/xqeznGrw898D5W6NZHxDC4EvAV wGZYMas90k7GPhqeVPojIlTFnjTrW3ZxFHfodwjWF9UOpIFXJAeARL8UCqrt01y9 5VHiJzVZa42oDdFoBiFyuQb4152jvKfvGwDSCPi1o7oMHy3u3W2tsxwX0gRq/rj5 mpDYccZwVYjoiwcSViRLlXR7TrZxqiiveCY+o2p02U+ESQMZVEAIsy1pVNzc/Gmc s8PIVjE+JxyGrg== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduiedrudehuddgtdefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhgggfestdekre dtredttdenucfhrhhomhepvfhhohhmrghsucfoohhnjhgrlhhonhcuoehthhhomhgrshes mhhonhhjrghlohhnrdhnvghtqeenucggtffrrghtthgvrhhnpeeufeeggfetvdekgfdvue etudehvedvkeffueffgffhhfeukedttdejffetvdfgieenucffohhmrghinhepvhgrrhhs rdhmkhdpvgigthhsuhgsughirhdrmhhkpdgvgihtrghpphdrmhhknecukfhppeejjedrud efgedrvddtfedrudekgeenucevlhhushhtvghrufhiiigvpedunecurfgrrhgrmhepmhgr ihhlfhhrohhmpehthhhomhgrshesmhhonhhjrghlohhnrdhnvght X-ME-Proxy: Received: from xps.monjalon.net (184.203.134.77.rev.sfr.net [77.134.203.184]) by mail.messagingengine.com (Postfix) with ESMTPA id BCDF1328005E; Mon, 7 Sep 2020 18:07:27 -0400 (EDT) From: Thomas Monjalon To: dev@dpdk.org Cc: david.marchand@redhat.com, bruce.richardson@intel.com, ciara.power@intel.com Date: Tue, 8 Sep 2020 00:06:46 +0200 Message-Id: <20200907220711.437405-7-thomas@monjalon.net> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200907220711.437405-1-thomas@monjalon.net> References: <20200903152717.42095-1-ciara.power@intel.com> <20200907220711.437405-1-thomas@monjalon.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v4 06/31] examples/multi_process: convert to pkg-config-based build X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Bruce Richardson Remove references to the old make build system and use pkg-config for building these examples. Signed-off-by: Bruce Richardson --- examples/multi_process/Makefile | 21 ++------ .../multi_process/client_server_mp/Makefile | 19 ++----- .../client_server_mp/mp_client/Makefile | 44 +++++++++++---- .../client_server_mp/mp_server/Makefile | 53 +++++++++++-------- examples/multi_process/hotplug_mp/Makefile | 46 +++++++++++----- examples/multi_process/simple_mp/Makefile | 44 ++++++++++----- examples/multi_process/symmetric_mp/Makefile | 44 ++++++++++----- 7 files changed, 168 insertions(+), 103 deletions(-) diff --git a/examples/multi_process/Makefile b/examples/multi_process/Makefile index 7f7e68d912..f0a999745a 100644 --- a/examples/multi_process/Makefile +++ b/examples/multi_process/Makefile @@ -1,18 +1,7 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation +subdirs := client_server_mp hotplug_mp simple_mp symmetric_mp -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif +.PHONY: all static shared clean $(subdirs) +all static shared clean: $(subdirs) -# 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 - -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += client_server_mp -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += simple_mp -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += symmetric_mp -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += hotplug_mp - -include $(RTE_SDK)/mk/rte.extsubdir.mk +$(subdirs): + $(MAKE) -C $@ $(MAKECMDGOALS) diff --git a/examples/multi_process/client_server_mp/Makefile b/examples/multi_process/client_server_mp/Makefile index fe7a8af605..e8debdfd9a 100644 --- a/examples/multi_process/client_server_mp/Makefile +++ b/examples/multi_process/client_server_mp/Makefile @@ -1,16 +1,7 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation +subdirs := mp_client mp_server -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif +.PHONY: all static shared clean $(subdirs) +all static shared clean: $(subdirs) -# 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 - -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += mp_client -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += mp_server - -include $(RTE_SDK)/mk/rte.extsubdir.mk +$(subdirs): + $(MAKE) -C $@ $(MAKECMDGOALS) diff --git a/examples/multi_process/client_server_mp/mp_client/Makefile b/examples/multi_process/client_server_mp/mp_client/Makefile index 7c447feba3..b723e545b7 100644 --- a/examples/multi_process/client_server_mp/mp_client/Makefile +++ b/examples/multi_process/client_server_mp/mp_client/Makefile @@ -1,21 +1,43 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2010-2014 Intel Corporation -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, can be overridden by command line or environment -include $(RTE_SDK)/mk/rte.vars.mk - # binary name APP = mp_client # all source are stored in SRCS-y SRCS-y := client.c -CFLAGS += $(WERROR_FLAGS) -O3 -CFLAGS += -I$(SRCDIR)/../shared -CFLAGS += -DALLOW_EXPERIMENTAL_API +CFLAGS += -I../shared -include $(RTE_SDK)/mk/rte.extapp.mk +# Build using pkg-config variables if possible +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif + +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) + +PKGCONF ?= pkg-config + +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) + +build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED) + +build/$(APP)-static: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_STATIC) + +build: + @mkdir -p $@ + +.PHONY: clean +clean: + rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared + test -d build && rmdir -p build || true diff --git a/examples/multi_process/client_server_mp/mp_server/Makefile b/examples/multi_process/client_server_mp/mp_server/Makefile index 50ebf1d7da..f49260a256 100644 --- a/examples/multi_process/client_server_mp/mp_server/Makefile +++ b/examples/multi_process/client_server_mp/mp_server/Makefile @@ -1,34 +1,43 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2010-2014 Intel Corporation -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# 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 - -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -$(error This application can only operate in a linux environment, \ -please change the definition of the RTE_TARGET environment variable) -endif - # binary name APP = mp_server # all source are stored in SRCS-y SRCS-y := main.c init.c args.c -INC := $(sort $(wildcard *.h)) +CFLAGS += -I../shared -CFLAGS += -DALLOW_EXPERIMENTAL_API -CFLAGS += $(WERROR_FLAGS) -O3 -CFLAGS += -I$(SRCDIR)/../shared +# Build using pkg-config variables if possible +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif -# for newer gcc, e.g. 4.4, no-strict-aliasing may not be necessary -# and so the next line can be removed in those cases. -EXTRA_CFLAGS += -fno-strict-aliasing +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) -include $(RTE_SDK)/mk/rte.extapp.mk +PKGCONF ?= pkg-config + +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) + +build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED) + +build/$(APP)-static: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_STATIC) + +build: + @mkdir -p $@ + +.PHONY: clean +clean: + rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared + test -d build && rmdir -p build || true diff --git a/examples/multi_process/hotplug_mp/Makefile b/examples/multi_process/hotplug_mp/Makefile index 1fd7aa085c..2c023a73d8 100644 --- a/examples/multi_process/hotplug_mp/Makefile +++ b/examples/multi_process/hotplug_mp/Makefile @@ -1,14 +1,5 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Intel Corporation - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# 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 +# Copyright(c) 2010-2014 Intel Corporation # binary name APP = hotplug_mp @@ -16,8 +7,35 @@ APP = hotplug_mp # all source are stored in SRCS-y SRCS-y := main.c commands.c -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API +# Build using pkg-config variables if possible +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif -include $(RTE_SDK)/mk/rte.extapp.mk +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) + +PKGCONF ?= pkg-config + +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) + +build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED) + +build/$(APP)-static: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_STATIC) + +build: + @mkdir -p $@ + +.PHONY: clean +clean: + rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared + test -d build && rmdir -p build || true diff --git a/examples/multi_process/simple_mp/Makefile b/examples/multi_process/simple_mp/Makefile index f88b499bdc..410f8b5368 100644 --- a/examples/multi_process/simple_mp/Makefile +++ b/examples/multi_process/simple_mp/Makefile @@ -1,23 +1,41 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2010-2014 Intel Corporation -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# 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 = simple_mp # all source are stored in SRCS-y SRCS-y := main.c mp_commands.c -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API +# Build using pkg-config variables if possible +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif -include $(RTE_SDK)/mk/rte.extapp.mk +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) + +PKGCONF ?= pkg-config + +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) + +build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED) + +build/$(APP)-static: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_STATIC) + +build: + @mkdir -p $@ + +.PHONY: clean +clean: + rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared + test -d build && rmdir -p build || true diff --git a/examples/multi_process/symmetric_mp/Makefile b/examples/multi_process/symmetric_mp/Makefile index b7544489bb..df69ecabe7 100644 --- a/examples/multi_process/symmetric_mp/Makefile +++ b/examples/multi_process/symmetric_mp/Makefile @@ -1,23 +1,41 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2010-2014 Intel Corporation -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# 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 = symmetric_mp # all source are stored in SRCS-y SRCS-y := main.c -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -CFLAGS += -DALLOW_EXPERIMENTAL_API +# Build using pkg-config variables if possible +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") +endif -include $(RTE_SDK)/mk/rte.extapp.mk +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) + +PKGCONF ?= pkg-config + +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) + +build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED) + +build/$(APP)-static: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_STATIC) + +build: + @mkdir -p $@ + +.PHONY: clean +clean: + rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared + test -d build && rmdir -p build || true -- 2.28.0