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 AA6EEA04C6 for ; Fri, 15 Nov 2019 16:17:23 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 83570374E; Fri, 15 Nov 2019 16:17:23 +0100 (CET) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by dpdk.org (Postfix) with ESMTP id 973F42C30; Fri, 15 Nov 2019 16:17:17 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 15 Nov 2019 07:17:17 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,308,1569308400"; d="scan'208";a="356133521" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.2]) by orsmga004.jf.intel.com with ESMTP; 15 Nov 2019 07:17:15 -0800 From: Bruce Richardson To: dev@dpdk.org Cc: ferruh.yigit@intel.com, Bruce Richardson , stable@dpdk.org Date: Fri, 15 Nov 2019 15:16:59 +0000 Message-Id: <20191115151700.64354-2-bruce.richardson@intel.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191115151700.64354-1-bruce.richardson@intel.com> References: <20191115103525.94786-1-ferruh.yigit@intel.com> <20191115151700.64354-1-bruce.richardson@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] [PATCH v2 1/2] devtools: fix example builds with older pkg-config X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Not all versions of pkg-config in distros have support for the --define-prefix flag [1], causing errors when building examples manually or with test-meson-builds.sh script [2]. For the former case, we need to remove the hard-coded use of the flag in the Makefiles. For the latter case, the flag is necessary for builds to succeed, so we skip the tests when it's not present, passing it as part of the pkg-config command if it is supported. [1] CentOS Linux release 7.7.1908 (Core) pkg-config version 0.27.1 [2] ## Building cmdline Unknown option --define-prefix gmake: Entering directory `...ild-x86-default/install-root/usr/local/share/dpdk/examples/cmdline' rm -f build/cmdline build/cmdline-static build/cmdline-shared test -d build && rmdir -p build || true Unknown option --define-prefix Unknown option --define-prefix gcc -O3 main.c commands.c parse_obj_list.c -o build/cmdline-shared main.c:14:28: fatal error: cmdline_rdline.h: No such file or directory Fixes: ca9268529d2b ("examples: support relocated DPDK install") Fixes: 7f80a2102bbb ("devtools: test pkg-config file") Cc: stable@dpdk.org Reported-by: Ferruh Yigit Signed-off-by: Bruce Richardson --- devtools/test-meson-builds.sh | 12 ++++++++---- examples/bbdev_app/Makefile | 2 +- examples/bond/Makefile | 2 +- examples/cmdline/Makefile | 2 +- examples/distributor/Makefile | 2 +- examples/eventdev_pipeline/Makefile | 2 +- examples/fips_validation/Makefile | 2 +- examples/flow_classify/Makefile | 2 +- examples/flow_filtering/Makefile | 2 +- examples/helloworld/Makefile | 2 +- examples/ioat/Makefile | 10 ++++++---- examples/ip_fragmentation/Makefile | 2 +- examples/ip_pipeline/Makefile | 2 +- examples/ip_reassembly/Makefile | 2 +- examples/ipsec-secgw/Makefile | 2 +- examples/ipv4_multicast/Makefile | 2 +- examples/kni/Makefile | 2 +- examples/l2fwd-cat/Makefile | 2 +- examples/l2fwd-crypto/Makefile | 2 +- examples/l2fwd-event/Makefile | 2 +- examples/l2fwd-jobstats/Makefile | 2 +- examples/l2fwd-keepalive/Makefile | 2 +- examples/l2fwd/Makefile | 2 +- examples/l3fwd-acl/Makefile | 2 +- examples/l3fwd-power/Makefile | 2 +- examples/l3fwd/Makefile | 2 +- examples/link_status_interrupt/Makefile | 2 +- examples/ntb/Makefile | 10 ++++++---- examples/packet_ordering/Makefile | 2 +- examples/ptpclient/Makefile | 2 +- examples/qos_meter/Makefile | 2 +- examples/qos_sched/Makefile | 2 +- examples/rxtx_callbacks/Makefile | 2 +- examples/service_cores/Makefile | 2 +- examples/skeleton/Makefile | 2 +- examples/tep_termination/Makefile | 2 +- examples/timer/Makefile | 2 +- examples/vdpa/Makefile | 2 +- examples/vhost/Makefile | 2 +- examples/vhost_blk/Makefile | 10 ++++++---- examples/vhost_crypto/Makefile | 2 +- examples/vmdq/Makefile | 2 +- examples/vmdq_dcb/Makefile | 2 +- 43 files changed, 65 insertions(+), 55 deletions(-) diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh index 08e83eb5c..e3a5a5d51 100755 --- a/devtools/test-meson-builds.sh +++ b/devtools/test-meson-builds.sh @@ -133,7 +133,11 @@ load_env cc pc_file=$(find $DESTDIR -name libdpdk.pc) export PKG_CONFIG_PATH=$(dirname $pc_file):$PKG_CONFIG_PATH -for example in cmdline helloworld l2fwd l3fwd skeleton timer; do - echo "## Building $example" - $MAKE -C $DESTDIR/usr/local/share/dpdk/examples/$example clean all -done +# if pkg-config defines the necessary flags, test building some examples +if pkg-config --define-prefix libdpdk >/dev/null 2>&1; then + export PKGCONF="pkg-config --define-prefix" + for example in cmdline helloworld l2fwd l3fwd skeleton timer; do + echo "## Building $example" + $MAKE -C $DESTDIR/usr/local/share/dpdk/examples/$example clean all + done +fi diff --git a/examples/bbdev_app/Makefile b/examples/bbdev_app/Makefile index 715c521a9..033f5aada 100644 --- a/examples/bbdev_app/Makefile +++ b/examples/bbdev_app/Makefile @@ -17,7 +17,7 @@ shared: build/$(APP)-shared static: build/$(APP)-static ln -sf $(APP)-static build/$(APP) -PKGCONF=pkg-config --define-prefix +PKGCONF ?= pkg-config PC_FILE := $(shell $(PKGCONF) --path libdpdk) CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) diff --git a/examples/bond/Makefile b/examples/bond/Makefile index 0229b31bb..3f1ae1b6f 100644 --- a/examples/bond/Makefile +++ b/examples/bond/Makefile @@ -19,7 +19,7 @@ static: build/$(APP)-static LDFLAGS += -lrte_pmd_bond -PKGCONF=pkg-config --define-prefix +PKGCONF ?= pkg-config PC_FILE := $(shell $(PKGCONF) --path libdpdk) CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) diff --git a/examples/cmdline/Makefile b/examples/cmdline/Makefile index c1852080a..f362a2afb 100644 --- a/examples/cmdline/Makefile +++ b/examples/cmdline/Makefile @@ -17,7 +17,7 @@ shared: build/$(APP)-shared static: build/$(APP)-static ln -sf $(APP)-static build/$(APP) -PKGCONF=pkg-config --define-prefix +PKGCONF ?= pkg-config PC_FILE := $(shell $(PKGCONF) --path libdpdk) CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) diff --git a/examples/distributor/Makefile b/examples/distributor/Makefile index bac8d5578..ac804da34 100644 --- a/examples/distributor/Makefile +++ b/examples/distributor/Makefile @@ -17,7 +17,7 @@ shared: build/$(APP)-shared static: build/$(APP)-static ln -sf $(APP)-static build/$(APP) -PKGCONF=pkg-config --define-prefix +PKGCONF ?= pkg-config PC_FILE := $(shell $(PKGCONF) --path libdpdk) CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) diff --git a/examples/eventdev_pipeline/Makefile b/examples/eventdev_pipeline/Makefile index 205145853..9a6250b85 100644 --- a/examples/eventdev_pipeline/Makefile +++ b/examples/eventdev_pipeline/Makefile @@ -19,7 +19,7 @@ shared: build/$(APP)-shared static: build/$(APP)-static ln -sf $(APP)-static build/$(APP) -PKGCONF=pkg-config --define-prefix +PKGCONF ?= pkg-config PC_FILE := $(shell $(PKGCONF) --path libdpdk) CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) diff --git a/examples/fips_validation/Makefile b/examples/fips_validation/Makefile index 9485daf7a..da5c8f6e7 100644 --- a/examples/fips_validation/Makefile +++ b/examples/fips_validation/Makefile @@ -26,7 +26,7 @@ shared: build/$(APP)-shared static: build/$(APP)-static ln -sf $(APP)-static build/$(APP) -PKGCONF=pkg-config --define-prefix +PKGCONF ?= pkg-config PC_FILE := $(shell $(PKGCONF) --path libdpdk) CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) diff --git a/examples/flow_classify/Makefile b/examples/flow_classify/Makefile index 4c23e5c6d..0b41ac4eb 100644 --- a/examples/flow_classify/Makefile +++ b/examples/flow_classify/Makefile @@ -17,7 +17,7 @@ shared: build/$(APP)-shared static: build/$(APP)-static ln -sf $(APP)-static build/$(APP) -PKGCONF=pkg-config --define-prefix +PKGCONF ?= pkg-config PC_FILE := $(shell $(PKGCONF) --path libdpdk) CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) diff --git a/examples/flow_filtering/Makefile b/examples/flow_filtering/Makefile index a63a75555..1d5ab739c 100644 --- a/examples/flow_filtering/Makefile +++ b/examples/flow_filtering/Makefile @@ -15,7 +15,7 @@ shared: build/$(APP)-shared static: build/$(APP)-static ln -sf $(APP)-static build/$(APP) -PKGCONF=pkg-config --define-prefix +PKGCONF ?= pkg-config PC_FILE := $(shell $(PKGCONF) --path libdpdk) CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) diff --git a/examples/helloworld/Makefile b/examples/helloworld/Makefile index 403afa050..267f90b4e 100644 --- a/examples/helloworld/Makefile +++ b/examples/helloworld/Makefile @@ -17,7 +17,7 @@ shared: build/$(APP)-shared static: build/$(APP)-static ln -sf $(APP)-static build/$(APP) -PKGCONF=pkg-config --define-prefix +PKGCONF ?= pkg-config PC_FILE := $(shell $(PKGCONF) --path libdpdk) CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) diff --git a/examples/ioat/Makefile b/examples/ioat/Makefile index 2a4d1da2d..ad4c63e31 100644 --- a/examples/ioat/Makefile +++ b/examples/ioat/Makefile @@ -17,10 +17,12 @@ shared: build/$(APP)-shared static: build/$(APP)-static ln -sf $(APP)-static build/$(APP) -PC_FILE := $(shell pkg-config --path libdpdk) -CFLAGS += -O3 $(shell pkg-config --cflags libdpdk) -LDFLAGS_SHARED = $(shell pkg-config --libs libdpdk) -LDFLAGS_STATIC = -Wl,-Bstatic $(shell pkg-config --static --libs libdpdk) +PKGCONF ?= pkg-config + +PC_FILE := $(shell $(PKGCONF) --path libdpdk) +CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC = -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk) build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED) diff --git a/examples/ip_fragmentation/Makefile b/examples/ip_fragmentation/Makefile index 6af25a02e..1d1396211 100644 --- a/examples/ip_fragmentation/Makefile +++ b/examples/ip_fragmentation/Makefile @@ -18,7 +18,7 @@ shared: build/$(APP)-shared static: build/$(APP)-static ln -sf $(APP)-static build/$(APP) -PKGCONF=pkg-config --define-prefix +PKGCONF ?= pkg-config PC_FILE := $(shell $(PKGCONF) --path libdpdk) CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) diff --git a/examples/ip_pipeline/Makefile b/examples/ip_pipeline/Makefile index cf10d7180..77d37cc40 100644 --- a/examples/ip_pipeline/Makefile +++ b/examples/ip_pipeline/Makefile @@ -30,7 +30,7 @@ shared: build/$(APP)-shared static: build/$(APP)-static ln -sf $(APP)-static build/$(APP) -PKGCONF=pkg-config --define-prefix +PKGCONF ?= pkg-config PC_FILE := $(shell $(PKGCONF) --path libdpdk) CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) diff --git a/examples/ip_reassembly/Makefile b/examples/ip_reassembly/Makefile index 0b1a904e0..3d7fac195 100644 --- a/examples/ip_reassembly/Makefile +++ b/examples/ip_reassembly/Makefile @@ -18,7 +18,7 @@ shared: build/$(APP)-shared static: build/$(APP)-static ln -sf $(APP)-static build/$(APP) -PKGCONF=pkg-config --define-prefix +PKGCONF ?= pkg-config PC_FILE := $(shell $(PKGCONF) --path libdpdk) CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) diff --git a/examples/ipsec-secgw/Makefile b/examples/ipsec-secgw/Makefile index 851123be5..1c2b944d6 100644 --- a/examples/ipsec-secgw/Makefile +++ b/examples/ipsec-secgw/Makefile @@ -28,7 +28,7 @@ shared: build/$(APP)-shared static: build/$(APP)-static ln -sf $(APP)-static build/$(APP) -PKGCONF=pkg-config --define-prefix +PKGCONF ?= pkg-config PC_FILE := $(shell $(PKGCONF) --path libdpdk) CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) diff --git a/examples/ipv4_multicast/Makefile b/examples/ipv4_multicast/Makefile index 5f8a67dd4..5f9d73881 100644 --- a/examples/ipv4_multicast/Makefile +++ b/examples/ipv4_multicast/Makefile @@ -18,7 +18,7 @@ shared: build/$(APP)-shared static: build/$(APP)-static ln -sf $(APP)-static build/$(APP) -PKGCONF=pkg-config --define-prefix +PKGCONF ?= pkg-config PC_FILE := $(shell $(PKGCONF) --path libdpdk) CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) diff --git a/examples/kni/Makefile b/examples/kni/Makefile index 5dc8118e3..fbe0097cf 100644 --- a/examples/kni/Makefile +++ b/examples/kni/Makefile @@ -17,7 +17,7 @@ shared: build/$(APP)-shared static: build/$(APP)-static ln -sf $(APP)-static build/$(APP) -PKGCONF=pkg-config --define-prefix +PKGCONF ?= pkg-config PC_FILE := $(shell $(PKGCONF) --path libdpdk) CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) diff --git a/examples/l2fwd-cat/Makefile b/examples/l2fwd-cat/Makefile index c1960d6d3..86e56a1e7 100644 --- a/examples/l2fwd-cat/Makefile +++ b/examples/l2fwd-cat/Makefile @@ -17,7 +17,7 @@ shared: build/$(APP)-shared static: build/$(APP)-static ln -sf $(APP)-static build/$(APP) -PKGCONF=pkg-config --define-prefix +PKGCONF ?= pkg-config PC_FILE := $(shell $(PKGCONF) --path libdpdk) CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) diff --git a/examples/l2fwd-crypto/Makefile b/examples/l2fwd-crypto/Makefile index 29fd530b4..ecfbab1f5 100644 --- a/examples/l2fwd-crypto/Makefile +++ b/examples/l2fwd-crypto/Makefile @@ -17,7 +17,7 @@ shared: build/$(APP)-shared static: build/$(APP)-static ln -sf $(APP)-static build/$(APP) -PKGCONF=pkg-config --define-prefix +PKGCONF ?= pkg-config PC_FILE := $(shell $(PKGCONF) --path libdpdk) CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) diff --git a/examples/l2fwd-event/Makefile b/examples/l2fwd-event/Makefile index 6f4176882..04e6796a6 100644 --- a/examples/l2fwd-event/Makefile +++ b/examples/l2fwd-event/Makefile @@ -23,7 +23,7 @@ shared: build/$(APP)-shared static: build/$(APP)-static ln -sf $(APP)-static build/$(APP) -PKGCONF=pkg-config --define-prefix +PKGCONF ?= pkg-config PC_FILE := $(shell $(PKGCONF) --path libdpdk) CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) diff --git a/examples/l2fwd-jobstats/Makefile b/examples/l2fwd-jobstats/Makefile index 729a39e93..0882c2697 100644 --- a/examples/l2fwd-jobstats/Makefile +++ b/examples/l2fwd-jobstats/Makefile @@ -17,7 +17,7 @@ shared: build/$(APP)-shared static: build/$(APP)-static ln -sf $(APP)-static build/$(APP) -PKGCONF=pkg-config --define-prefix +PKGCONF ?= pkg-config PC_FILE := $(shell $(PKGCONF) --path libdpdk) CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) diff --git a/examples/l2fwd-keepalive/Makefile b/examples/l2fwd-keepalive/Makefile index 37de27a6f..68e467426 100644 --- a/examples/l2fwd-keepalive/Makefile +++ b/examples/l2fwd-keepalive/Makefile @@ -19,7 +19,7 @@ static: build/$(APP)-static LDFLAGS += -pthread -lrt -PKGCONF=pkg-config --define-prefix +PKGCONF ?= pkg-config PC_FILE := $(shell $(PKGCONF) --path libdpdk) CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) diff --git a/examples/l2fwd/Makefile b/examples/l2fwd/Makefile index 9c506844e..97af55a50 100644 --- a/examples/l2fwd/Makefile +++ b/examples/l2fwd/Makefile @@ -17,7 +17,7 @@ shared: build/$(APP)-shared static: build/$(APP)-static ln -sf $(APP)-static build/$(APP) -PKGCONF=pkg-config --define-prefix +PKGCONF ?= pkg-config PC_FILE := $(shell $(PKGCONF) --path libdpdk) CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) diff --git a/examples/l3fwd-acl/Makefile b/examples/l3fwd-acl/Makefile index e2c989f71..7fcf1e7a6 100644 --- a/examples/l3fwd-acl/Makefile +++ b/examples/l3fwd-acl/Makefile @@ -17,7 +17,7 @@ shared: build/$(APP)-shared static: build/$(APP)-static ln -sf $(APP)-static build/$(APP) -PKGCONF=pkg-config --define-prefix +PKGCONF ?= pkg-config PC_FILE := $(shell $(PKGCONF) --path libdpdk) CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) diff --git a/examples/l3fwd-power/Makefile b/examples/l3fwd-power/Makefile index 98248f462..de5d15cb7 100644 --- a/examples/l3fwd-power/Makefile +++ b/examples/l3fwd-power/Makefile @@ -17,7 +17,7 @@ shared: build/$(APP)-shared static: build/$(APP)-static ln -sf $(APP)-static build/$(APP) -PKGCONF=pkg-config --define-prefix +PKGCONF ?= pkg-config PC_FILE := $(shell $(PKGCONF) --path libdpdk) CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) diff --git a/examples/l3fwd/Makefile b/examples/l3fwd/Makefile index c55f5c288..042eae92b 100644 --- a/examples/l3fwd/Makefile +++ b/examples/l3fwd/Makefile @@ -17,7 +17,7 @@ shared: build/$(APP)-shared static: build/$(APP)-static ln -sf $(APP)-static build/$(APP) -PKGCONF=pkg-config --define-prefix +PKGCONF ?= pkg-config PC_FILE := $(shell $(PKGCONF) --path libdpdk) CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) diff --git a/examples/link_status_interrupt/Makefile b/examples/link_status_interrupt/Makefile index 97e5a14a8..3d55aa1ac 100644 --- a/examples/link_status_interrupt/Makefile +++ b/examples/link_status_interrupt/Makefile @@ -17,7 +17,7 @@ shared: build/$(APP)-shared static: build/$(APP)-static ln -sf $(APP)-static build/$(APP) -PKGCONF=pkg-config --define-prefix +PKGCONF ?= pkg-config PC_FILE := $(shell $(PKGCONF) --path libdpdk) CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) diff --git a/examples/ntb/Makefile b/examples/ntb/Makefile index 5ddd9b95f..7927f44ac 100644 --- a/examples/ntb/Makefile +++ b/examples/ntb/Makefile @@ -18,13 +18,15 @@ shared: build/$(APP)-shared static: build/$(APP)-static ln -sf $(APP)-static build/$(APP) +PKGCONF ?= pkg-config + CFLAGS += -D_FILE_OFFSET_BITS=64 LDFLAGS += -pthread -PC_FILE := $(shell pkg-config --path libdpdk) -CFLAGS += -O3 $(shell pkg-config --cflags libdpdk) -LDFLAGS_SHARED = $(shell pkg-config --libs libdpdk) -LDFLAGS_STATIC = -Wl,-Bstatic $(shell pkg-config --static --libs libdpdk) +PC_FILE := $(shell $(PKGCONF) --path libdpdk) +CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC = -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk) build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED) diff --git a/examples/packet_ordering/Makefile b/examples/packet_ordering/Makefile index 51acaf7eb..b04a39399 100644 --- a/examples/packet_ordering/Makefile +++ b/examples/packet_ordering/Makefile @@ -17,7 +17,7 @@ shared: build/$(APP)-shared static: build/$(APP)-static ln -sf $(APP)-static build/$(APP) -PKGCONF=pkg-config --define-prefix +PKGCONF ?= pkg-config PC_FILE := $(shell $(PKGCONF) --path libdpdk) CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) diff --git a/examples/ptpclient/Makefile b/examples/ptpclient/Makefile index 89e2bacbd..0f8390b68 100644 --- a/examples/ptpclient/Makefile +++ b/examples/ptpclient/Makefile @@ -17,7 +17,7 @@ shared: build/$(APP)-shared static: build/$(APP)-static ln -sf $(APP)-static build/$(APP) -PKGCONF=pkg-config --define-prefix +PKGCONF ?= pkg-config PC_FILE := $(shell $(PKGCONF) --path libdpdk) CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) diff --git a/examples/qos_meter/Makefile b/examples/qos_meter/Makefile index e5217cf7c..4a9b628b8 100644 --- a/examples/qos_meter/Makefile +++ b/examples/qos_meter/Makefile @@ -17,7 +17,7 @@ shared: build/$(APP)-shared static: build/$(APP)-static ln -sf $(APP)-static build/$(APP) -PKGCONF=pkg-config --define-prefix +PKGCONF ?= pkg-config PC_FILE := $(shell $(PKGCONF) --path libdpdk) CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) diff --git a/examples/qos_sched/Makefile b/examples/qos_sched/Makefile index ce2d25371..5737ad652 100644 --- a/examples/qos_sched/Makefile +++ b/examples/qos_sched/Makefile @@ -17,7 +17,7 @@ shared: build/$(APP)-shared static: build/$(APP)-static ln -sf $(APP)-static build/$(APP) -PKGCONF=pkg-config --define-prefix +PKGCONF ?= pkg-config PC_FILE := $(shell $(PKGCONF) --path libdpdk) CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) diff --git a/examples/rxtx_callbacks/Makefile b/examples/rxtx_callbacks/Makefile index edd5b52cd..0f126692a 100644 --- a/examples/rxtx_callbacks/Makefile +++ b/examples/rxtx_callbacks/Makefile @@ -17,7 +17,7 @@ shared: build/$(APP)-shared static: build/$(APP)-static ln -sf $(APP)-static build/$(APP) -PKGCONF=pkg-config --define-prefix +PKGCONF ?= pkg-config PC_FILE := $(shell $(PKGCONF) --path libdpdk) CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) diff --git a/examples/service_cores/Makefile b/examples/service_cores/Makefile index abbb7aed2..6fecedc54 100644 --- a/examples/service_cores/Makefile +++ b/examples/service_cores/Makefile @@ -17,7 +17,7 @@ shared: build/$(APP)-shared static: build/$(APP)-static ln -sf $(APP)-static build/$(APP) -PKGCONF=pkg-config --define-prefix +PKGCONF ?= pkg-config PC_FILE := $(shell $(PKGCONF) --path libdpdk) CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) diff --git a/examples/skeleton/Makefile b/examples/skeleton/Makefile index c5ac26029..fdc458c91 100644 --- a/examples/skeleton/Makefile +++ b/examples/skeleton/Makefile @@ -17,7 +17,7 @@ shared: build/$(APP)-shared static: build/$(APP)-static ln -sf $(APP)-static build/$(APP) -PKGCONF=pkg-config --define-prefix +PKGCONF ?= pkg-config PC_FILE := $(shell $(PKGCONF) --path libdpdk) CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) diff --git a/examples/tep_termination/Makefile b/examples/tep_termination/Makefile index 31165bd92..57af4e7cc 100644 --- a/examples/tep_termination/Makefile +++ b/examples/tep_termination/Makefile @@ -19,7 +19,7 @@ static: build/$(APP)-static LDFLAGS += -pthread -PKGCONF=pkg-config --define-prefix +PKGCONF ?= pkg-config PC_FILE := $(shell $(PKGCONF) --path libdpdk) CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) diff --git a/examples/timer/Makefile b/examples/timer/Makefile index a86178355..21f05918c 100644 --- a/examples/timer/Makefile +++ b/examples/timer/Makefile @@ -17,7 +17,7 @@ shared: build/$(APP)-shared static: build/$(APP)-static ln -sf $(APP)-static build/$(APP) -PKGCONF=pkg-config --define-prefix +PKGCONF ?= pkg-config PC_FILE := $(shell $(PKGCONF) --path libdpdk) CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) diff --git a/examples/vdpa/Makefile b/examples/vdpa/Makefile index 2ac991a4b..68d088f22 100644 --- a/examples/vdpa/Makefile +++ b/examples/vdpa/Makefile @@ -18,7 +18,7 @@ shared: build/$(APP)-shared static: build/$(APP)-static ln -sf $(APP)-static build/$(APP) -PKGCONF=pkg-config --define-prefix +PKGCONF ?= pkg-config PC_FILE := $(shell $(PKGCONF) --path libdpdk) CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) diff --git a/examples/vhost/Makefile b/examples/vhost/Makefile index f84b7f017..fcb864d0e 100644 --- a/examples/vhost/Makefile +++ b/examples/vhost/Makefile @@ -19,7 +19,7 @@ static: build/$(APP)-static LDFLAGS += -pthread -PKGCONF=pkg-config --define-prefix +PKGCONF ?= pkg-config PC_FILE := $(shell $(PKGCONF) --path libdpdk) CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) diff --git a/examples/vhost_blk/Makefile b/examples/vhost_blk/Makefile index a10a90071..af2a3f87b 100644 --- a/examples/vhost_blk/Makefile +++ b/examples/vhost_blk/Makefile @@ -18,12 +18,14 @@ shared: build/$(APP)-shared static: build/$(APP)-static ln -sf $(APP)-static build/$(APP) +PKGCONF ?= pkg-config + LDFLAGS += -pthread -PC_FILE := $(shell pkg-config --path libdpdk) -CFLAGS += -O3 $(shell pkg-config --cflags libdpdk) -LDFLAGS_SHARED = $(shell pkg-config --libs libdpdk) -LDFLAGS_STATIC = -Wl,-Bstatic $(shell pkg-config --static --libs libdpdk) +PC_FILE := $(shell $(PKGCONF) --path libdpdk) +CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC = -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk) CFLAGS += -DALLOW_EXPERIMENTAL_API diff --git a/examples/vhost_crypto/Makefile b/examples/vhost_crypto/Makefile index a9e1c4d3a..43e2e3244 100644 --- a/examples/vhost_crypto/Makefile +++ b/examples/vhost_crypto/Makefile @@ -18,7 +18,7 @@ shared: build/$(APP)-shared static: build/$(APP)-static ln -sf $(APP)-static build/$(APP) -PKGCONF=pkg-config --define-prefix +PKGCONF ?= pkg-config PC_FILE := $(shell $(PKGCONF) --path libdpdk) CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) diff --git a/examples/vmdq/Makefile b/examples/vmdq/Makefile index 1557ee86b..e0f1e4c40 100644 --- a/examples/vmdq/Makefile +++ b/examples/vmdq/Makefile @@ -17,7 +17,7 @@ shared: build/$(APP)-shared static: build/$(APP)-static ln -sf $(APP)-static build/$(APP) -PKGCONF=pkg-config --define-prefix +PKGCONF ?= pkg-config PC_FILE := $(shell $(PKGCONF) --path libdpdk) CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) diff --git a/examples/vmdq_dcb/Makefile b/examples/vmdq_dcb/Makefile index 391096cfb..def515872 100644 --- a/examples/vmdq_dcb/Makefile +++ b/examples/vmdq_dcb/Makefile @@ -17,7 +17,7 @@ shared: build/$(APP)-shared static: build/$(APP)-static ln -sf $(APP)-static build/$(APP) -PKGCONF=pkg-config --define-prefix +PKGCONF ?= pkg-config PC_FILE := $(shell $(PKGCONF) --path libdpdk) CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) -- 2.21.0