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 E1D3AA04F5 for ; Wed, 11 Dec 2019 22:28:55 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D6A681D9E; Wed, 11 Dec 2019 22:28:55 +0100 (CET) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by dpdk.org (Postfix) with ESMTP id 2EC301D9E for ; Wed, 11 Dec 2019 22:28:54 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576099733; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PD2utR2NSUrHugrgA2edNO91tRg7+fWyFSIU3x0tRGs=; b=CTFGHBetXljn93H7oAiqAFe7GckWFEeLf3V4jpja822JYL3T2lFzYJA/zqbqc/C4C42nJ2 1KCH0qgKbVF2avGjWO9X8fY7WmSiszTMgqZ2PhyaKcdzXwxPKhN5et87ZYsRmi98548UZw KzAoM5rdU/VAP7Q5vzb+3KZzeHTzOs0= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-252-WhWTVMTAPXqrsNF90Jos0g-1; Wed, 11 Dec 2019 16:28:50 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EE7DB800D41; Wed, 11 Dec 2019 21:28:48 +0000 (UTC) Received: from rh.redhat.com (ovpn-116-64.ams2.redhat.com [10.36.116.64]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7DD4610013A1; Wed, 11 Dec 2019 21:28:47 +0000 (UTC) From: Kevin Traynor To: Bruce Richardson Cc: Ferruh Yigit , dpdk stable Date: Wed, 11 Dec 2019 21:26:35 +0000 Message-Id: <20191211212702.27851-43-ktraynor@redhat.com> In-Reply-To: <20191211212702.27851-1-ktraynor@redhat.com> References: <20191211212702.27851-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: WhWTVMTAPXqrsNF90Jos0g-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'examples: hide error for missing pkg-config path flag' has been queued to LTS release 18.11.6 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" Hi, FYI, your patch has been queued to LTS release 18.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/17/19. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasi= ng (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/859c2be3c7744e02ed= b9bc59d76c1a3c11f5b268 Thanks. Kevin. --- >From 859c2be3c7744e02edb9bc59d76c1a3c11f5b268 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Fri, 15 Nov 2019 15:17:00 +0000 Subject: [PATCH] examples: hide error for missing pkg-config path flag [ upstream commit 69b1bb49ed82a4e96b67046f4916eecc14c6ad55 ] Some versions of pkg-config don't support the --path flag, which is not a fatal error when building the apps. Without the flag, the makefile just cannot track the .pc file of DPDK as a dependency of the build. Therefore, we can ignore the error and suppress it by redirecting to /dev/null the stderr from that call to pkg-config. Fixes: 22119c4591a0 ("examples: use pkg-config in makefiles") Signed-off-by: Bruce Richardson Tested-by: Ferruh Yigit --- examples/bbdev_app/Makefile | 10 ++++++---- examples/bond/Makefile | 10 ++++++---- examples/cmdline/Makefile | 10 ++++++---- examples/distributor/Makefile | 10 ++++++---- examples/eventdev_pipeline/Makefile | 10 ++++++---- examples/exception_path/Makefile | 10 ++++++---- examples/fips_validation/Makefile | 10 ++++++---- examples/flow_classify/Makefile | 10 ++++++---- examples/flow_filtering/Makefile | 10 ++++++---- examples/helloworld/Makefile | 10 ++++++---- examples/ip_fragmentation/Makefile | 10 ++++++---- examples/ip_pipeline/Makefile | 10 ++++++---- examples/ip_reassembly/Makefile | 10 ++++++---- examples/ipsec-secgw/Makefile | 10 ++++++---- examples/ipv4_multicast/Makefile | 10 ++++++---- examples/kni/Makefile | 10 ++++++---- examples/l2fwd-cat/Makefile | 10 ++++++---- examples/l2fwd-crypto/Makefile | 10 ++++++---- examples/l2fwd-jobstats/Makefile | 10 ++++++---- examples/l2fwd-keepalive/Makefile | 10 ++++++---- examples/l2fwd/Makefile | 10 ++++++---- examples/l3fwd-acl/Makefile | 10 ++++++---- examples/l3fwd-power/Makefile | 10 ++++++---- examples/l3fwd-vf/Makefile | 10 ++++++---- examples/l3fwd/Makefile | 10 ++++++---- examples/link_status_interrupt/Makefile | 10 ++++++---- examples/load_balancer/Makefile | 10 ++++++---- examples/packet_ordering/Makefile | 10 ++++++---- examples/ptpclient/Makefile | 10 ++++++---- examples/qos_meter/Makefile | 10 ++++++---- examples/qos_sched/Makefile | 10 ++++++---- examples/rxtx_callbacks/Makefile | 10 ++++++---- examples/service_cores/Makefile | 10 ++++++---- examples/skeleton/Makefile | 10 ++++++---- examples/tep_termination/Makefile | 10 ++++++---- examples/timer/Makefile | 10 ++++++---- examples/vhost/Makefile | 10 ++++++---- examples/vhost_scsi/Makefile | 8 ++++---- examples/vmdq/Makefile | 10 ++++++---- examples/vmdq_dcb/Makefile | 10 ++++++---- 40 files changed, 238 insertions(+), 160 deletions(-) diff --git a/examples/bbdev_app/Makefile b/examples/bbdev_app/Makefile index 378b4cb54..3e759dc6e 100644 --- a/examples/bbdev_app/Makefile +++ b/examples/bbdev_app/Makefile @@ -18,8 +18,10 @@ static: build/$(APP)-static =09ln -sf $(APP)-static build/$(APP) =20 -PC_FILE :=3D $(shell pkg-config --path libdpdk) -CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) -LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) -LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpdk= ) +PKGCONF ?=3D pkg-config + +PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk= ) =20 CFLAGS +=3D -DALLOW_EXPERIMENTAL_API diff --git a/examples/bond/Makefile b/examples/bond/Makefile index 665fcf6a3..ebff5719f 100644 --- a/examples/bond/Makefile +++ b/examples/bond/Makefile @@ -20,8 +20,10 @@ static: build/$(APP)-static LDFLAGS +=3D -lrte_pmd_bond =20 -PC_FILE :=3D $(shell pkg-config --path libdpdk) -CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) -LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) -LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpdk= ) +PKGCONF ?=3D pkg-config + +PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk= ) =20 CFLAGS +=3D -DALLOW_EXPERIMENTAL_API diff --git a/examples/cmdline/Makefile b/examples/cmdline/Makefile index fbe521c39..890346b04 100644 --- a/examples/cmdline/Makefile +++ b/examples/cmdline/Makefile @@ -18,8 +18,10 @@ static: build/$(APP)-static =09ln -sf $(APP)-static build/$(APP) =20 -PC_FILE :=3D $(shell pkg-config --path libdpdk) -CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) -LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) -LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpdk= ) +PKGCONF ?=3D pkg-config + +PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk= ) =20 build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build diff --git a/examples/distributor/Makefile b/examples/distributor/Makefile index 372446f9c..f4500d546 100644 --- a/examples/distributor/Makefile +++ b/examples/distributor/Makefile @@ -18,8 +18,10 @@ static: build/$(APP)-static =09ln -sf $(APP)-static build/$(APP) =20 -PC_FILE :=3D $(shell pkg-config --path libdpdk) -CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) -LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) -LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpdk= ) +PKGCONF ?=3D pkg-config + +PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk= ) =20 build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build diff --git a/examples/eventdev_pipeline/Makefile b/examples/eventdev_pipeli= ne/Makefile index cab4d4050..881f0ceac 100644 --- a/examples/eventdev_pipeline/Makefile +++ b/examples/eventdev_pipeline/Makefile @@ -20,8 +20,10 @@ static: build/$(APP)-static =09ln -sf $(APP)-static build/$(APP) =20 -PC_FILE :=3D $(shell pkg-config --path libdpdk) -CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) -LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) -LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpdk= ) +PKGCONF ?=3D pkg-config + +PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk= ) =20 CFLAGS +=3D -DALLOW_EXPERIMENTAL_API diff --git a/examples/exception_path/Makefile b/examples/exception_path/Mak= efile index 013ae1cbe..ce97c7d67 100644 --- a/examples/exception_path/Makefile +++ b/examples/exception_path/Makefile @@ -18,8 +18,10 @@ static: build/$(APP)-static =09ln -sf $(APP)-static build/$(APP) =20 -PC_FILE :=3D $(shell pkg-config --path libdpdk) -CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) -LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) -LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpdk= ) +PKGCONF ?=3D pkg-config + +PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk= ) =20 build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build diff --git a/examples/fips_validation/Makefile b/examples/fips_validation/M= akefile index 5fb64e4d9..2573436b2 100644 --- a/examples/fips_validation/Makefile +++ b/examples/fips_validation/Makefile @@ -25,8 +25,10 @@ static: build/$(APP)-static =09ln -sf $(APP)-static build/$(APP) =20 -PC_FILE :=3D $(shell pkg-config --path libdpdk) -CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) -LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) -LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpdk= ) +PKGCONF ?=3D pkg-config + +PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk= ) =20 build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build diff --git a/examples/flow_classify/Makefile b/examples/flow_classify/Makef= ile index 5c0f7fc57..29c563398 100644 --- a/examples/flow_classify/Makefile +++ b/examples/flow_classify/Makefile @@ -18,8 +18,10 @@ static: build/$(APP)-static =09ln -sf $(APP)-static build/$(APP) =20 -PC_FILE :=3D $(shell pkg-config --path libdpdk) -CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) -LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) -LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpdk= ) +PKGCONF ?=3D pkg-config + +PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk= ) =20 CFLAGS +=3D -DALLOW_EXPERIMENTAL_API diff --git a/examples/flow_filtering/Makefile b/examples/flow_filtering/Mak= efile index 5140f5079..ffa6e93da 100644 --- a/examples/flow_filtering/Makefile +++ b/examples/flow_filtering/Makefile @@ -16,8 +16,10 @@ static: build/$(APP)-static =09ln -sf $(APP)-static build/$(APP) =20 -PC_FILE :=3D $(shell pkg-config --path libdpdk) -CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) -LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) -LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpdk= ) +PKGCONF ?=3D pkg-config + +PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk= ) =20 build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build diff --git a/examples/helloworld/Makefile b/examples/helloworld/Makefile index 970c9ea80..b9024cec1 100644 --- a/examples/helloworld/Makefile +++ b/examples/helloworld/Makefile @@ -18,8 +18,10 @@ static: build/$(APP)-static =09ln -sf $(APP)-static build/$(APP) =20 -PC_FILE :=3D $(shell pkg-config --path libdpdk) -CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) -LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) -LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpdk= ) +PKGCONF ?=3D pkg-config + +PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk= ) =20 build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build diff --git a/examples/ip_fragmentation/Makefile b/examples/ip_fragmentation= /Makefile index 84e66f239..7865aeb14 100644 --- a/examples/ip_fragmentation/Makefile +++ b/examples/ip_fragmentation/Makefile @@ -19,8 +19,10 @@ static: build/$(APP)-static =09ln -sf $(APP)-static build/$(APP) =20 -PC_FILE :=3D $(shell pkg-config --path libdpdk) -CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) -LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) -LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpdk= ) +PKGCONF ?=3D pkg-config + +PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk= ) =20 build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build diff --git a/examples/ip_pipeline/Makefile b/examples/ip_pipeline/Makefile index d667af811..bf57bf52d 100644 --- a/examples/ip_pipeline/Makefile +++ b/examples/ip_pipeline/Makefile @@ -31,8 +31,10 @@ static: build/$(APP)-static =09ln -sf $(APP)-static build/$(APP) =20 -PC_FILE :=3D $(shell pkg-config --path libdpdk) -CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) -LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) -LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpdk= ) +PKGCONF ?=3D pkg-config + +PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk= ) =20 CFLAGS +=3D -I. diff --git a/examples/ip_reassembly/Makefile b/examples/ip_reassembly/Makef= ile index ad7e5feae..87dc7d3ba 100644 --- a/examples/ip_reassembly/Makefile +++ b/examples/ip_reassembly/Makefile @@ -19,8 +19,10 @@ static: build/$(APP)-static =09ln -sf $(APP)-static build/$(APP) =20 -PC_FILE :=3D $(shell pkg-config --path libdpdk) -CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) -LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) -LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpdk= ) +PKGCONF ?=3D pkg-config + +PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk= ) =20 build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build diff --git a/examples/ipsec-secgw/Makefile b/examples/ipsec-secgw/Makefile index 3fd2079df..9a7131c14 100644 --- a/examples/ipsec-secgw/Makefile +++ b/examples/ipsec-secgw/Makefile @@ -28,8 +28,10 @@ static: build/$(APP)-static =09ln -sf $(APP)-static build/$(APP) =20 -PC_FILE :=3D $(shell pkg-config --path libdpdk) -CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) -LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) -LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpdk= ) +PKGCONF ?=3D pkg-config + +PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk= ) =20 CFLAGS +=3D -DALLOW_EXPERIMENTAL_API diff --git a/examples/ipv4_multicast/Makefile b/examples/ipv4_multicast/Mak= efile index 83a21feba..afc6d8dbe 100644 --- a/examples/ipv4_multicast/Makefile +++ b/examples/ipv4_multicast/Makefile @@ -19,8 +19,10 @@ static: build/$(APP)-static =09ln -sf $(APP)-static build/$(APP) =20 -PC_FILE :=3D $(shell pkg-config --path libdpdk) -CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) -LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) -LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpdk= ) +PKGCONF ?=3D pkg-config + +PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk= ) =20 build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build diff --git a/examples/kni/Makefile b/examples/kni/Makefile index 6c3e30396..b3d39a577 100644 --- a/examples/kni/Makefile +++ b/examples/kni/Makefile @@ -18,9 +18,11 @@ static: build/$(APP)-static =09ln -sf $(APP)-static build/$(APP) =20 -PC_FILE :=3D $(shell pkg-config --path libdpdk) -CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) +PKGCONF ?=3D pkg-config + +PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) CFLAGS +=3D -DALLOW_EXPERIMENTAL_API -LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) -LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpdk= ) +LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk= ) =20 build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build diff --git a/examples/l2fwd-cat/Makefile b/examples/l2fwd-cat/Makefile index 3c39ed6db..5059d39c0 100644 --- a/examples/l2fwd-cat/Makefile +++ b/examples/l2fwd-cat/Makefile @@ -18,8 +18,10 @@ static: build/$(APP)-static =09ln -sf $(APP)-static build/$(APP) =20 -PC_FILE :=3D $(shell pkg-config --path libdpdk) -CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) -LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) -LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpdk= ) +PKGCONF ?=3D pkg-config + +PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk= ) =20 LDFLAGS +=3D -lpqos diff --git a/examples/l2fwd-crypto/Makefile b/examples/l2fwd-crypto/Makefil= e index 21fd8eeae..08881ff18 100644 --- a/examples/l2fwd-crypto/Makefile +++ b/examples/l2fwd-crypto/Makefile @@ -18,8 +18,10 @@ static: build/$(APP)-static =09ln -sf $(APP)-static build/$(APP) =20 -PC_FILE :=3D $(shell pkg-config --path libdpdk) -CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) -LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) -LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpdk= ) +PKGCONF ?=3D pkg-config + +PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk= ) =20 build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build diff --git a/examples/l2fwd-jobstats/Makefile b/examples/l2fwd-jobstats/Mak= efile index aec35390e..ec5f589f0 100644 --- a/examples/l2fwd-jobstats/Makefile +++ b/examples/l2fwd-jobstats/Makefile @@ -18,8 +18,10 @@ static: build/$(APP)-static =09ln -sf $(APP)-static build/$(APP) =20 -PC_FILE :=3D $(shell pkg-config --path libdpdk) -CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) -LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) -LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpdk= ) +PKGCONF ?=3D pkg-config + +PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk= ) =20 build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build diff --git a/examples/l2fwd-keepalive/Makefile b/examples/l2fwd-keepalive/M= akefile index 5c7eb85cd..85dd6462e 100644 --- a/examples/l2fwd-keepalive/Makefile +++ b/examples/l2fwd-keepalive/Makefile @@ -20,8 +20,10 @@ static: build/$(APP)-static LDFLAGS +=3D -pthread -lrt =20 -PC_FILE :=3D $(shell pkg-config --path libdpdk) -CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) -LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) -LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpdk= ) +PKGCONF ?=3D pkg-config + +PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk= ) =20 build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build diff --git a/examples/l2fwd/Makefile b/examples/l2fwd/Makefile index 42b2234af..c1e614366 100644 --- a/examples/l2fwd/Makefile +++ b/examples/l2fwd/Makefile @@ -18,8 +18,10 @@ static: build/$(APP)-static =09ln -sf $(APP)-static build/$(APP) =20 -PC_FILE :=3D $(shell pkg-config --path libdpdk) -CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) -LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) -LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpdk= ) +PKGCONF ?=3D pkg-config + +PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk= ) =20 build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build diff --git a/examples/l3fwd-acl/Makefile b/examples/l3fwd-acl/Makefile index 8f01f7550..1d49df9ff 100644 --- a/examples/l3fwd-acl/Makefile +++ b/examples/l3fwd-acl/Makefile @@ -18,8 +18,10 @@ static: build/$(APP)-static =09ln -sf $(APP)-static build/$(APP) =20 -PC_FILE :=3D $(shell pkg-config --path libdpdk) -CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) -LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) -LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpdk= ) +PKGCONF ?=3D pkg-config + +PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk= ) =20 build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build diff --git a/examples/l3fwd-power/Makefile b/examples/l3fwd-power/Makefile index 53aaaca48..f037b7858 100644 --- a/examples/l3fwd-power/Makefile +++ b/examples/l3fwd-power/Makefile @@ -18,8 +18,10 @@ static: build/$(APP)-static =09ln -sf $(APP)-static build/$(APP) =20 -PC_FILE :=3D $(shell pkg-config --path libdpdk) -CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) -LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) -LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpdk= ) +PKGCONF ?=3D pkg-config + +PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk= ) =20 CFLAGS +=3D -DALLOW_EXPERIMENTAL_API diff --git a/examples/l3fwd-vf/Makefile b/examples/l3fwd-vf/Makefile index c51117768..646096b01 100644 --- a/examples/l3fwd-vf/Makefile +++ b/examples/l3fwd-vf/Makefile @@ -18,8 +18,10 @@ static: build/$(APP)-static =09ln -sf $(APP)-static build/$(APP) =20 -PC_FILE :=3D $(shell pkg-config --path libdpdk) -CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) -LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) -LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpdk= ) +PKGCONF ?=3D pkg-config + +PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk= ) =20 build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build diff --git a/examples/l3fwd/Makefile b/examples/l3fwd/Makefile index 4357ddb79..9f3493aa4 100644 --- a/examples/l3fwd/Makefile +++ b/examples/l3fwd/Makefile @@ -18,8 +18,10 @@ static: build/$(APP)-static =09ln -sf $(APP)-static build/$(APP) =20 -PC_FILE :=3D $(shell pkg-config --path libdpdk) -CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) -LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) -LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpdk= ) +PKGCONF ?=3D pkg-config + +PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk= ) =20 build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build diff --git a/examples/link_status_interrupt/Makefile b/examples/link_status= _interrupt/Makefile index de11a17f0..67ac6fefa 100644 --- a/examples/link_status_interrupt/Makefile +++ b/examples/link_status_interrupt/Makefile @@ -18,8 +18,10 @@ static: build/$(APP)-static =09ln -sf $(APP)-static build/$(APP) =20 -PC_FILE :=3D $(shell pkg-config --path libdpdk) -CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) -LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) -LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpdk= ) +PKGCONF ?=3D pkg-config + +PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk= ) =20 build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build diff --git a/examples/load_balancer/Makefile b/examples/load_balancer/Makef= ile index 9261ce4ef..696c8f007 100644 --- a/examples/load_balancer/Makefile +++ b/examples/load_balancer/Makefile @@ -18,8 +18,10 @@ static: build/$(APP)-static =09ln -sf $(APP)-static build/$(APP) =20 -PC_FILE :=3D $(shell pkg-config --path libdpdk) -CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) -LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) -LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpdk= ) +PKGCONF ?=3D pkg-config + +PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk= ) =20 build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build diff --git a/examples/packet_ordering/Makefile b/examples/packet_ordering/M= akefile index 27b82b6ea..b91adec48 100644 --- a/examples/packet_ordering/Makefile +++ b/examples/packet_ordering/Makefile @@ -18,8 +18,10 @@ static: build/$(APP)-static =09ln -sf $(APP)-static build/$(APP) =20 -PC_FILE :=3D $(shell pkg-config --path libdpdk) -CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) -LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) -LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpdk= ) +PKGCONF ?=3D pkg-config + +PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk= ) =20 build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build diff --git a/examples/ptpclient/Makefile b/examples/ptpclient/Makefile index 3eec3dc19..b2625785d 100644 --- a/examples/ptpclient/Makefile +++ b/examples/ptpclient/Makefile @@ -18,8 +18,10 @@ static: build/$(APP)-static =09ln -sf $(APP)-static build/$(APP) =20 -PC_FILE :=3D $(shell pkg-config --path libdpdk) -CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) -LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) -LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpdk= ) +PKGCONF ?=3D pkg-config + +PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk= ) =20 build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build diff --git a/examples/qos_meter/Makefile b/examples/qos_meter/Makefile index 95bd1b148..7ecf06450 100644 --- a/examples/qos_meter/Makefile +++ b/examples/qos_meter/Makefile @@ -18,8 +18,10 @@ static: build/$(APP)-static =09ln -sf $(APP)-static build/$(APP) =20 -PC_FILE :=3D $(shell pkg-config --path libdpdk) -CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) -LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) -LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpdk= ) +PKGCONF ?=3D pkg-config + +PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk= ) =20 CFLAGS +=3D -DALLOW_EXPERIMENTAL_API diff --git a/examples/qos_sched/Makefile b/examples/qos_sched/Makefile index 2cdd5fa3d..b1fb1c69b 100644 --- a/examples/qos_sched/Makefile +++ b/examples/qos_sched/Makefile @@ -18,8 +18,10 @@ static: build/$(APP)-static =09ln -sf $(APP)-static build/$(APP) =20 -PC_FILE :=3D $(shell pkg-config --path libdpdk) -CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) -LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) -LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpdk= ) +PKGCONF ?=3D pkg-config + +PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk= ) =20 build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build diff --git a/examples/rxtx_callbacks/Makefile b/examples/rxtx_callbacks/Mak= efile index 2873f7995..a5f5dfe68 100644 --- a/examples/rxtx_callbacks/Makefile +++ b/examples/rxtx_callbacks/Makefile @@ -18,8 +18,10 @@ static: build/$(APP)-static =09ln -sf $(APP)-static build/$(APP) =20 -PC_FILE :=3D $(shell pkg-config --path libdpdk) -CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) -LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) -LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpdk= ) +PKGCONF ?=3D pkg-config + +PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk= ) =20 build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build diff --git a/examples/service_cores/Makefile b/examples/service_cores/Makef= ile index 49e2a5878..7ff06899f 100644 --- a/examples/service_cores/Makefile +++ b/examples/service_cores/Makefile @@ -18,8 +18,10 @@ static: build/$(APP)-static =09ln -sf $(APP)-static build/$(APP) =20 -PC_FILE :=3D $(shell pkg-config --path libdpdk) -CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) -LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) -LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpdk= ) +PKGCONF ?=3D pkg-config + +PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk= ) =20 build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build diff --git a/examples/skeleton/Makefile b/examples/skeleton/Makefile index f58c8903d..3ad8fb215 100644 --- a/examples/skeleton/Makefile +++ b/examples/skeleton/Makefile @@ -18,8 +18,10 @@ static: build/$(APP)-static =09ln -sf $(APP)-static build/$(APP) =20 -PC_FILE :=3D $(shell pkg-config --path libdpdk) -CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) -LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) -LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpdk= ) +PKGCONF ?=3D pkg-config + +PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk= ) =20 build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build diff --git a/examples/tep_termination/Makefile b/examples/tep_termination/M= akefile index 5f76a97ef..2ace3103c 100644 --- a/examples/tep_termination/Makefile +++ b/examples/tep_termination/Makefile @@ -20,8 +20,10 @@ static: build/$(APP)-static LDFLAGS +=3D -pthread =20 -PC_FILE :=3D $(shell pkg-config --path libdpdk) -CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) -LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) -LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpdk= ) +PKGCONF ?=3D pkg-config + +PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk= ) =20 CFLAGS +=3D -DALLOW_EXPERIMENTAL_API diff --git a/examples/timer/Makefile b/examples/timer/Makefile index 3e8a14261..635e47d1d 100644 --- a/examples/timer/Makefile +++ b/examples/timer/Makefile @@ -18,8 +18,10 @@ static: build/$(APP)-static =09ln -sf $(APP)-static build/$(APP) =20 -PC_FILE :=3D $(shell pkg-config --path libdpdk) -CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) -LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) -LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpdk= ) +PKGCONF ?=3D pkg-config + +PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk= ) =20 build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build diff --git a/examples/vhost/Makefile b/examples/vhost/Makefile index a8a8aba95..e43ae7793 100644 --- a/examples/vhost/Makefile +++ b/examples/vhost/Makefile @@ -20,8 +20,10 @@ static: build/$(APP)-static LDFLAGS +=3D -pthread =20 -PC_FILE :=3D $(shell pkg-config --path libdpdk) -CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) -LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) -LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpdk= ) +PKGCONF ?=3D pkg-config + +PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk= ) =20 CFLAGS +=3D -DALLOW_EXPERIMENTAL_API diff --git a/examples/vhost_scsi/Makefile b/examples/vhost_scsi/Makefile index 69e102de5..2911acf27 100644 --- a/examples/vhost_scsi/Makefile +++ b/examples/vhost_scsi/Makefile @@ -21,8 +21,8 @@ CFLAGS +=3D -D_FILE_OFFSET_BITS=3D64 LDFLAGS +=3D -pthread =20 -PC_FILE :=3D $(shell pkg-config --path libdpdk) -CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) -LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) -LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpdk= ) +PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk= ) =20 build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build diff --git a/examples/vmdq/Makefile b/examples/vmdq/Makefile index a9983a184..e4315ac2b 100644 --- a/examples/vmdq/Makefile +++ b/examples/vmdq/Makefile @@ -18,8 +18,10 @@ static: build/$(APP)-static =09ln -sf $(APP)-static build/$(APP) =20 -PC_FILE :=3D $(shell pkg-config --path libdpdk) -CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) -LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) -LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpdk= ) +PKGCONF ?=3D pkg-config + +PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk= ) =20 build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build diff --git a/examples/vmdq_dcb/Makefile b/examples/vmdq_dcb/Makefile index 5a8934c84..937002976 100644 --- a/examples/vmdq_dcb/Makefile +++ b/examples/vmdq_dcb/Makefile @@ -18,8 +18,10 @@ static: build/$(APP)-static =09ln -sf $(APP)-static build/$(APP) =20 -PC_FILE :=3D $(shell pkg-config --path libdpdk) -CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) -LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) -LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpdk= ) +PKGCONF ?=3D pkg-config + +PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) +CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) +LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) +LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk= ) =20 build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build --=20 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092019-12-11 21:24:16.119089668 +0000 +++ 0043-examples-hide-error-for-missing-pkg-config-path-flag.patch=092019-= 12-11 21:24:12.700650535 +0000 @@ -1 +1 @@ -From 69b1bb49ed82a4e96b67046f4916eecc14c6ad55 Mon Sep 17 00:00:00 2001 +From 859c2be3c7744e02edb9bc59d76c1a3c11f5b268 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 69b1bb49ed82a4e96b67046f4916eecc14c6ad55 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -18,43 +19,41 @@ - 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 | 2 +- - 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 | 2 +- - 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 | 2 +- - examples/vhost_crypto/Makefile | 2 +- - examples/vmdq/Makefile | 2 +- - examples/vmdq_dcb/Makefile | 2 +- - 42 files changed, 42 insertions(+), 42 deletions(-) + examples/bbdev_app/Makefile | 10 ++++++---- + examples/bond/Makefile | 10 ++++++---- + examples/cmdline/Makefile | 10 ++++++---- + examples/distributor/Makefile | 10 ++++++---- + examples/eventdev_pipeline/Makefile | 10 ++++++---- + examples/exception_path/Makefile | 10 ++++++---- + examples/fips_validation/Makefile | 10 ++++++---- + examples/flow_classify/Makefile | 10 ++++++---- + examples/flow_filtering/Makefile | 10 ++++++---- + examples/helloworld/Makefile | 10 ++++++---- + examples/ip_fragmentation/Makefile | 10 ++++++---- + examples/ip_pipeline/Makefile | 10 ++++++---- + examples/ip_reassembly/Makefile | 10 ++++++---- + examples/ipsec-secgw/Makefile | 10 ++++++---- + examples/ipv4_multicast/Makefile | 10 ++++++---- + examples/kni/Makefile | 10 ++++++---- + examples/l2fwd-cat/Makefile | 10 ++++++---- + examples/l2fwd-crypto/Makefile | 10 ++++++---- + examples/l2fwd-jobstats/Makefile | 10 ++++++---- + examples/l2fwd-keepalive/Makefile | 10 ++++++---- + examples/l2fwd/Makefile | 10 ++++++---- + examples/l3fwd-acl/Makefile | 10 ++++++---- + examples/l3fwd-power/Makefile | 10 ++++++---- + examples/l3fwd-vf/Makefile | 10 ++++++---- + examples/l3fwd/Makefile | 10 ++++++---- + examples/link_status_interrupt/Makefile | 10 ++++++---- + examples/load_balancer/Makefile | 10 ++++++---- + examples/packet_ordering/Makefile | 10 ++++++---- + examples/ptpclient/Makefile | 10 ++++++---- + examples/qos_meter/Makefile | 10 ++++++---- + examples/qos_sched/Makefile | 10 ++++++---- + examples/rxtx_callbacks/Makefile | 10 ++++++---- + examples/service_cores/Makefile | 10 ++++++---- + examples/skeleton/Makefile | 10 ++++++---- + examples/tep_termination/Makefile | 10 ++++++---- + examples/timer/Makefile | 10 ++++++---- + examples/vhost/Makefile | 10 ++++++---- + examples/vhost_scsi/Makefile | 8 ++++---- + examples/vmdq/Makefile | 10 ++++++---- + examples/vmdq_dcb/Makefile | 10 ++++++---- + 40 files changed, 238 insertions(+), 160 deletions(-) @@ -63 +62 @@ -index 033f5aada..ead3f016b 100644 +index 378b4cb54..3e759dc6e 100644 @@ -66,2 +65,2 @@ -@@ -20,5 +20,5 @@ static: build/$(APP)-static - PKGCONF ?=3D pkg-config +@@ -18,8 +18,10 @@ static: build/$(APP)-static + =09ln -sf $(APP)-static build/$(APP) @@ -69,4 +68,12 @@ --PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk) -+PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) - CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) - LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) +-PC_FILE :=3D $(shell pkg-config --path libdpdk) +-CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) +-LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) +-LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpd= k) ++PKGCONF ?=3D pkg-config ++ ++PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) ++CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) ++LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) ++LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpd= k) +=20 + CFLAGS +=3D -DALLOW_EXPERIMENTAL_API @@ -74 +81 @@ -index 3f1ae1b6f..2030ca410 100644 +index 665fcf6a3..ebff5719f 100644 @@ -77,2 +84,2 @@ -@@ -22,5 +22,5 @@ LDFLAGS +=3D -lrte_pmd_bond - PKGCONF ?=3D pkg-config +@@ -20,8 +20,10 @@ static: build/$(APP)-static + LDFLAGS +=3D -lrte_pmd_bond @@ -80,4 +87,12 @@ --PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk) -+PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) - CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) - LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) +-PC_FILE :=3D $(shell pkg-config --path libdpdk) +-CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) +-LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) +-LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpd= k) ++PKGCONF ?=3D pkg-config ++ ++PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) ++CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) ++LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) ++LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpd= k) +=20 + CFLAGS +=3D -DALLOW_EXPERIMENTAL_API @@ -85 +100 @@ -index f362a2afb..0b6b54540 100644 +index fbe521c39..890346b04 100644 @@ -88,2 +103,2 @@ -@@ -20,5 +20,5 @@ static: build/$(APP)-static - PKGCONF ?=3D pkg-config +@@ -18,8 +18,10 @@ static: build/$(APP)-static + =09ln -sf $(APP)-static build/$(APP) @@ -91,4 +106,12 @@ --PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk) -+PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) - CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) - LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) +-PC_FILE :=3D $(shell pkg-config --path libdpdk) +-CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) +-LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) +-LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpd= k) ++PKGCONF ?=3D pkg-config ++ ++PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) ++CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) ++LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) ++LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpd= k) +=20 + build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build @@ -96 +119 @@ -index ac804da34..4192d8a4a 100644 +index 372446f9c..f4500d546 100644 @@ -99,2 +122,2 @@ -@@ -20,5 +20,5 @@ static: build/$(APP)-static - PKGCONF ?=3D pkg-config +@@ -18,8 +18,10 @@ static: build/$(APP)-static + =09ln -sf $(APP)-static build/$(APP) @@ -102,4 +125,12 @@ --PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk) -+PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) - CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) - LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) +-PC_FILE :=3D $(shell pkg-config --path libdpdk) +-CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) +-LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) +-LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpd= k) ++PKGCONF ?=3D pkg-config ++ ++PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) ++CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) ++LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) ++LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpd= k) +=20 + build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build @@ -107 +138 @@ -index 9a6250b85..96cd24437 100644 +index cab4d4050..881f0ceac 100644 @@ -110,2 +141,2 @@ -@@ -22,5 +22,5 @@ static: build/$(APP)-static - PKGCONF ?=3D pkg-config +@@ -20,8 +20,10 @@ static: build/$(APP)-static + =09ln -sf $(APP)-static build/$(APP) @@ -113,4 +144,31 @@ --PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk) -+PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) - CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) - LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) +-PC_FILE :=3D $(shell pkg-config --path libdpdk) +-CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) +-LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) +-LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpd= k) ++PKGCONF ?=3D pkg-config ++ ++PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) ++CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) ++LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) ++LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpd= k) +=20 + CFLAGS +=3D -DALLOW_EXPERIMENTAL_API +diff --git a/examples/exception_path/Makefile b/examples/exception_path/Ma= kefile +index 013ae1cbe..ce97c7d67 100644 +--- a/examples/exception_path/Makefile ++++ b/examples/exception_path/Makefile +@@ -18,8 +18,10 @@ static: build/$(APP)-static + =09ln -sf $(APP)-static build/$(APP) +=20 +-PC_FILE :=3D $(shell pkg-config --path libdpdk) +-CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) +-LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) +-LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpd= k) ++PKGCONF ?=3D pkg-config ++ ++PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) ++CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) ++LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) ++LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpd= k) +=20 + build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build @@ -118 +176 @@ -index da5c8f6e7..1385e8cc8 100644 +index 5fb64e4d9..2573436b2 100644 @@ -121,2 +179,2 @@ -@@ -29,5 +29,5 @@ static: build/$(APP)-static - PKGCONF ?=3D pkg-config +@@ -25,8 +25,10 @@ static: build/$(APP)-static + =09ln -sf $(APP)-static build/$(APP) @@ -124,4 +182,12 @@ --PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk) -+PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) - CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) - LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) +-PC_FILE :=3D $(shell pkg-config --path libdpdk) +-CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) +-LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) +-LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpd= k) ++PKGCONF ?=3D pkg-config ++ ++PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) ++CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) ++LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) ++LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpd= k) +=20 + build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build @@ -129 +195 @@ -index 0b41ac4eb..6864941b3 100644 +index 5c0f7fc57..29c563398 100644 @@ -132,2 +198,2 @@ -@@ -20,5 +20,5 @@ static: build/$(APP)-static - PKGCONF ?=3D pkg-config +@@ -18,8 +18,10 @@ static: build/$(APP)-static + =09ln -sf $(APP)-static build/$(APP) @@ -135,4 +201,12 @@ --PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk) -+PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) - CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) - LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) +-PC_FILE :=3D $(shell pkg-config --path libdpdk) +-CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) +-LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) +-LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpd= k) ++PKGCONF ?=3D pkg-config ++ ++PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) ++CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) ++LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) ++LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpd= k) +=20 + CFLAGS +=3D -DALLOW_EXPERIMENTAL_API @@ -140 +214 @@ -index 1d5ab739c..6c51c0b7a 100644 +index 5140f5079..ffa6e93da 100644 @@ -143,2 +217,2 @@ -@@ -18,5 +18,5 @@ static: build/$(APP)-static - PKGCONF ?=3D pkg-config +@@ -16,8 +16,10 @@ static: build/$(APP)-static + =09ln -sf $(APP)-static build/$(APP) @@ -146,4 +220,12 @@ --PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk) -+PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) - CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) - LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) +-PC_FILE :=3D $(shell pkg-config --path libdpdk) +-CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) +-LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) +-LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpd= k) ++PKGCONF ?=3D pkg-config ++ ++PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) ++CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) ++LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) ++LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpd= k) +=20 + build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build @@ -151 +233 @@ -index 267f90b4e..16d82b02f 100644 +index 970c9ea80..b9024cec1 100644 @@ -154,2 +236,2 @@ -@@ -20,5 +20,5 @@ static: build/$(APP)-static - PKGCONF ?=3D pkg-config +@@ -18,8 +18,10 @@ static: build/$(APP)-static + =09ln -sf $(APP)-static build/$(APP) @@ -157,10 +239,10 @@ --PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk) -+PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) - CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) - LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) -diff --git a/examples/ioat/Makefile b/examples/ioat/Makefile -index ad4c63e31..ef63f5d68 100644 ---- a/examples/ioat/Makefile -+++ b/examples/ioat/Makefile -@@ -20,5 +20,5 @@ static: build/$(APP)-static - PKGCONF ?=3D pkg-config +-PC_FILE :=3D $(shell pkg-config --path libdpdk) +-CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) +-LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) +-LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpd= k) ++PKGCONF ?=3D pkg-config ++ ++PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) ++CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) ++LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) ++LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpd= k) @@ -168,4 +250 @@ --PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk) -+PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) - CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) - LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) + build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build @@ -173 +252 @@ -index 1d1396211..ede0c4f02 100644 +index 84e66f239..7865aeb14 100644 @@ -176,2 +255,2 @@ -@@ -21,5 +21,5 @@ static: build/$(APP)-static - PKGCONF ?=3D pkg-config +@@ -19,8 +19,10 @@ static: build/$(APP)-static + =09ln -sf $(APP)-static build/$(APP) @@ -179,4 +258,12 @@ --PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk) -+PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) - CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) - LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) +-PC_FILE :=3D $(shell pkg-config --path libdpdk) +-CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) +-LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) +-LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpd= k) ++PKGCONF ?=3D pkg-config ++ ++PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) ++CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) ++LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) ++LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpd= k) +=20 + build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build @@ -184 +271 @@ -index 77d37cc40..3a0193818 100644 +index d667af811..bf57bf52d 100644 @@ -187,2 +274,2 @@ -@@ -33,5 +33,5 @@ static: build/$(APP)-static - PKGCONF ?=3D pkg-config +@@ -31,8 +31,10 @@ static: build/$(APP)-static + =09ln -sf $(APP)-static build/$(APP) @@ -190,4 +277,12 @@ --PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk) -+PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) - CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) - LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) +-PC_FILE :=3D $(shell pkg-config --path libdpdk) +-CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) +-LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) +-LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpd= k) ++PKGCONF ?=3D pkg-config ++ ++PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) ++CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) ++LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) ++LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpd= k) +=20 + CFLAGS +=3D -I. @@ -195 +290 @@ -index 3d7fac195..3f2888b33 100644 +index ad7e5feae..87dc7d3ba 100644 @@ -198,2 +293,2 @@ -@@ -21,5 +21,5 @@ static: build/$(APP)-static - PKGCONF ?=3D pkg-config +@@ -19,8 +19,10 @@ static: build/$(APP)-static + =09ln -sf $(APP)-static build/$(APP) @@ -201,4 +296,12 @@ --PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk) -+PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) - CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) - LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) +-PC_FILE :=3D $(shell pkg-config --path libdpdk) +-CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) +-LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) +-LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpd= k) ++PKGCONF ?=3D pkg-config ++ ++PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) ++CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) ++LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) ++LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpd= k) +=20 + build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build @@ -206 +309 @@ -index 1c2b944d6..a4977f61f 100644 +index 3fd2079df..9a7131c14 100644 @@ -209,2 +312,2 @@ -@@ -31,5 +31,5 @@ static: build/$(APP)-static - PKGCONF ?=3D pkg-config +@@ -28,8 +28,10 @@ static: build/$(APP)-static + =09ln -sf $(APP)-static build/$(APP) @@ -212,4 +315,12 @@ --PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk) -+PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) - CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) - LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) +-PC_FILE :=3D $(shell pkg-config --path libdpdk) +-CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) +-LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) +-LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpd= k) ++PKGCONF ?=3D pkg-config ++ ++PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) ++CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) ++LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) ++LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpd= k) +=20 + CFLAGS +=3D -DALLOW_EXPERIMENTAL_API @@ -217 +328 @@ -index 5f9d73881..92d3db0f4 100644 +index 83a21feba..afc6d8dbe 100644 @@ -220,2 +331,2 @@ -@@ -21,5 +21,5 @@ static: build/$(APP)-static - PKGCONF ?=3D pkg-config +@@ -19,8 +19,10 @@ static: build/$(APP)-static + =09ln -sf $(APP)-static build/$(APP) @@ -223,4 +334,12 @@ --PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk) -+PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) - CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) - LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) +-PC_FILE :=3D $(shell pkg-config --path libdpdk) +-CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) +-LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) +-LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpd= k) ++PKGCONF ?=3D pkg-config ++ ++PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) ++CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) ++LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) ++LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpd= k) +=20 + build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build @@ -228 +347 @@ -index fbe0097cf..c7ca96d8a 100644 +index 6c3e30396..b3d39a577 100644 @@ -231,2 +350,2 @@ -@@ -20,5 +20,5 @@ static: build/$(APP)-static - PKGCONF ?=3D pkg-config +@@ -18,9 +18,11 @@ static: build/$(APP)-static + =09ln -sf $(APP)-static build/$(APP) @@ -234 +353,4 @@ --PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk) +-PC_FILE :=3D $(shell pkg-config --path libdpdk) +-CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) ++PKGCONF ?=3D pkg-config ++ @@ -236 +358 @@ - CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) ++CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) @@ -237,0 +360,6 @@ +-LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) +-LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpd= k) ++LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) ++LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpd= k) +=20 + build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build @@ -239 +367 @@ -index 86e56a1e7..b0e53c37e 100644 +index 3c39ed6db..5059d39c0 100644 @@ -242,2 +370,2 @@ -@@ -20,5 +20,5 @@ static: build/$(APP)-static - PKGCONF ?=3D pkg-config +@@ -18,8 +18,10 @@ static: build/$(APP)-static + =09ln -sf $(APP)-static build/$(APP) @@ -245,4 +373,12 @@ --PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk) -+PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) - CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) - LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) +-PC_FILE :=3D $(shell pkg-config --path libdpdk) +-CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) +-LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) +-LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpd= k) ++PKGCONF ?=3D pkg-config ++ ++PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) ++CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) ++LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) ++LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpd= k) +=20 + LDFLAGS +=3D -lpqos @@ -250 +386 @@ -index ecfbab1f5..2f1405a72 100644 +index 21fd8eeae..08881ff18 100644 @@ -253,2 +389,2 @@ -@@ -20,5 +20,5 @@ static: build/$(APP)-static - PKGCONF ?=3D pkg-config +@@ -18,8 +18,10 @@ static: build/$(APP)-static + =09ln -sf $(APP)-static build/$(APP) @@ -256,10 +392,10 @@ --PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk) -+PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) - CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) - LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) -diff --git a/examples/l2fwd-event/Makefile b/examples/l2fwd-event/Makefile -index 04e6796a6..4cdae36f1 100644 ---- a/examples/l2fwd-event/Makefile -+++ b/examples/l2fwd-event/Makefile -@@ -26,5 +26,5 @@ static: build/$(APP)-static - PKGCONF ?=3D pkg-config +-PC_FILE :=3D $(shell pkg-config --path libdpdk) +-CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) +-LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) +-LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpd= k) ++PKGCONF ?=3D pkg-config ++ ++PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) ++CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) ++LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) ++LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpd= k) @@ -267,4 +403 @@ --PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk) -+PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) - CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) - LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) + build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build @@ -272 +405 @@ -index 0882c2697..73c91faa8 100644 +index aec35390e..ec5f589f0 100644 @@ -275,2 +408,2 @@ -@@ -20,5 +20,5 @@ static: build/$(APP)-static - PKGCONF ?=3D pkg-config +@@ -18,8 +18,10 @@ static: build/$(APP)-static + =09ln -sf $(APP)-static build/$(APP) @@ -278,4 +411,12 @@ --PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk) -+PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) - CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) - LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) +-PC_FILE :=3D $(shell pkg-config --path libdpdk) +-CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) +-LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) +-LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpd= k) ++PKGCONF ?=3D pkg-config ++ ++PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) ++CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) ++LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) ++LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpd= k) +=20 + build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build @@ -283 +424 @@ -index 68e467426..94d1e58bb 100644 +index 5c7eb85cd..85dd6462e 100644 @@ -286,2 +427,2 @@ -@@ -22,5 +22,5 @@ LDFLAGS +=3D -pthread -lrt - PKGCONF ?=3D pkg-config +@@ -20,8 +20,10 @@ static: build/$(APP)-static + LDFLAGS +=3D -pthread -lrt @@ -289,4 +430,12 @@ --PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk) -+PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) - CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) - LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) +-PC_FILE :=3D $(shell pkg-config --path libdpdk) +-CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) +-LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) +-LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpd= k) ++PKGCONF ?=3D pkg-config ++ ++PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) ++CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) ++LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) ++LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpd= k) +=20 + build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build @@ -294 +443 @@ -index 97af55a50..8b7b26cb9 100644 +index 42b2234af..c1e614366 100644 @@ -297,2 +446,2 @@ -@@ -20,5 +20,5 @@ static: build/$(APP)-static - PKGCONF ?=3D pkg-config +@@ -18,8 +18,10 @@ static: build/$(APP)-static + =09ln -sf $(APP)-static build/$(APP) @@ -300,4 +449,12 @@ --PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk) -+PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) - CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) - # Add flag to allow experimental API as l2fwd uses rte_ethdev_set_ptype A= PI +-PC_FILE :=3D $(shell pkg-config --path libdpdk) +-CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) +-LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) +-LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpd= k) ++PKGCONF ?=3D pkg-config ++ ++PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) ++CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) ++LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) ++LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpd= k) +=20 + build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build @@ -305 +462 @@ -index 7fcf1e7a6..d9909584b 100644 +index 8f01f7550..1d49df9ff 100644 @@ -308,2 +465,2 @@ -@@ -20,5 +20,5 @@ static: build/$(APP)-static - PKGCONF ?=3D pkg-config +@@ -18,8 +18,10 @@ static: build/$(APP)-static + =09ln -sf $(APP)-static build/$(APP) @@ -311,4 +468,12 @@ --PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk) -+PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) - CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) - LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) +-PC_FILE :=3D $(shell pkg-config --path libdpdk) +-CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) +-LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) +-LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpd= k) ++PKGCONF ?=3D pkg-config ++ ++PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) ++CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) ++LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) ++LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpd= k) +=20 + build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build @@ -316 +481 @@ -index de5d15cb7..729d49639 100644 +index 53aaaca48..f037b7858 100644 @@ -319,2 +484,2 @@ -@@ -20,5 +20,5 @@ static: build/$(APP)-static - PKGCONF ?=3D pkg-config +@@ -18,8 +18,10 @@ static: build/$(APP)-static + =09ln -sf $(APP)-static build/$(APP) @@ -322,4 +487,31 @@ --PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk) -+PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) - CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) - LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) +-PC_FILE :=3D $(shell pkg-config --path libdpdk) +-CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) +-LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) +-LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpd= k) ++PKGCONF ?=3D pkg-config ++ ++PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) ++CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) ++LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) ++LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpd= k) +=20 + CFLAGS +=3D -DALLOW_EXPERIMENTAL_API +diff --git a/examples/l3fwd-vf/Makefile b/examples/l3fwd-vf/Makefile +index c51117768..646096b01 100644 +--- a/examples/l3fwd-vf/Makefile ++++ b/examples/l3fwd-vf/Makefile +@@ -18,8 +18,10 @@ static: build/$(APP)-static + =09ln -sf $(APP)-static build/$(APP) +=20 +-PC_FILE :=3D $(shell pkg-config --path libdpdk) +-CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) +-LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) +-LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpd= k) ++PKGCONF ?=3D pkg-config ++ ++PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) ++CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) ++LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) ++LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpd= k) +=20 + build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build @@ -327 +519 @@ -index 042eae92b..b2dbf2607 100644 +index 4357ddb79..9f3493aa4 100644 @@ -330,2 +522,2 @@ -@@ -20,5 +20,5 @@ static: build/$(APP)-static - PKGCONF ?=3D pkg-config +@@ -18,8 +18,10 @@ static: build/$(APP)-static + =09ln -sf $(APP)-static build/$(APP) @@ -333,4 +525,12 @@ --PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk) -+PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) - CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) - LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) +-PC_FILE :=3D $(shell pkg-config --path libdpdk) +-CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) +-LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) +-LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpd= k) ++PKGCONF ?=3D pkg-config ++ ++PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) ++CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) ++LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) ++LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpd= k) +=20 + build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build @@ -338 +538 @@ -index 3d55aa1ac..4f02a8901 100644 +index de11a17f0..67ac6fefa 100644 @@ -341,2 +541,2 @@ -@@ -20,5 +20,5 @@ static: build/$(APP)-static - PKGCONF ?=3D pkg-config +@@ -18,8 +18,10 @@ static: build/$(APP)-static + =09ln -sf $(APP)-static build/$(APP) @@ -344,10 +544,29 @@ --PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk) -+PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) - CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) - LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) -diff --git a/examples/ntb/Makefile b/examples/ntb/Makefile -index 7927f44ac..baeba11e8 100644 ---- a/examples/ntb/Makefile -+++ b/examples/ntb/Makefile -@@ -24,5 +24,5 @@ CFLAGS +=3D -D_FILE_OFFSET_BITS=3D64 - LDFLAGS +=3D -pthread +-PC_FILE :=3D $(shell pkg-config --path libdpdk) +-CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) +-LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) +-LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpd= k) ++PKGCONF ?=3D pkg-config ++ ++PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) ++CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) ++LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) ++LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpd= k) +=20 + build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build +diff --git a/examples/load_balancer/Makefile b/examples/load_balancer/Make= file +index 9261ce4ef..696c8f007 100644 +--- a/examples/load_balancer/Makefile ++++ b/examples/load_balancer/Makefile +@@ -18,8 +18,10 @@ static: build/$(APP)-static + =09ln -sf $(APP)-static build/$(APP) +=20 +-PC_FILE :=3D $(shell pkg-config --path libdpdk) +-CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) +-LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) +-LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpd= k) ++PKGCONF ?=3D pkg-config ++ ++PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) ++CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) ++LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) ++LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpd= k) @@ -355,4 +574 @@ --PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk) -+PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) - CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) - LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) + build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build @@ -360 +576 @@ -index b04a39399..261b7f06a 100644 +index 27b82b6ea..b91adec48 100644 @@ -363,2 +579,2 @@ -@@ -20,5 +20,5 @@ static: build/$(APP)-static - PKGCONF ?=3D pkg-config +@@ -18,8 +18,10 @@ static: build/$(APP)-static + =09ln -sf $(APP)-static build/$(APP) @@ -366,4 +582,12 @@ --PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk) -+PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) - CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) - LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) +-PC_FILE :=3D $(shell pkg-config --path libdpdk) +-CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) +-LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) +-LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpd= k) ++PKGCONF ?=3D pkg-config ++ ++PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) ++CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) ++LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) ++LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpd= k) +=20 + build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build @@ -371 +595 @@ -index 0f8390b68..82d72b3e3 100644 +index 3eec3dc19..b2625785d 100644 @@ -374,2 +598,2 @@ -@@ -20,5 +20,5 @@ static: build/$(APP)-static - PKGCONF ?=3D pkg-config +@@ -18,8 +18,10 @@ static: build/$(APP)-static + =09ln -sf $(APP)-static build/$(APP) @@ -377,4 +601,12 @@ --PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk) -+PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) - CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) - LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) +-PC_FILE :=3D $(shell pkg-config --path libdpdk) +-CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) +-LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) +-LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpd= k) ++PKGCONF ?=3D pkg-config ++ ++PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) ++CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) ++LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) ++LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpd= k) +=20 + build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build @@ -382 +614 @@ -index 4a9b628b8..7c2bf88a9 100644 +index 95bd1b148..7ecf06450 100644 @@ -385,2 +617,2 @@ -@@ -20,5 +20,5 @@ static: build/$(APP)-static - PKGCONF ?=3D pkg-config +@@ -18,8 +18,10 @@ static: build/$(APP)-static + =09ln -sf $(APP)-static build/$(APP) @@ -388,4 +620,12 @@ --PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk) -+PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) - CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) - LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) +-PC_FILE :=3D $(shell pkg-config --path libdpdk) +-CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) +-LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) +-LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpd= k) ++PKGCONF ?=3D pkg-config ++ ++PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) ++CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) ++LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) ++LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpd= k) +=20 + CFLAGS +=3D -DALLOW_EXPERIMENTAL_API @@ -393 +633 @@ -index 5737ad652..525061ca0 100644 +index 2cdd5fa3d..b1fb1c69b 100644 @@ -396,2 +636,2 @@ -@@ -20,5 +20,5 @@ static: build/$(APP)-static - PKGCONF ?=3D pkg-config +@@ -18,8 +18,10 @@ static: build/$(APP)-static + =09ln -sf $(APP)-static build/$(APP) @@ -399,4 +639,12 @@ --PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk) -+PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) - CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) - LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) +-PC_FILE :=3D $(shell pkg-config --path libdpdk) +-CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) +-LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) +-LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpd= k) ++PKGCONF ?=3D pkg-config ++ ++PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) ++CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) ++LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) ++LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpd= k) +=20 + build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build @@ -404 +652 @@ -index 0f126692a..584b9fafb 100644 +index 2873f7995..a5f5dfe68 100644 @@ -407,2 +655,2 @@ -@@ -20,5 +20,5 @@ static: build/$(APP)-static - PKGCONF ?=3D pkg-config +@@ -18,8 +18,10 @@ static: build/$(APP)-static + =09ln -sf $(APP)-static build/$(APP) @@ -410,4 +658,12 @@ --PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk) -+PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) - CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) - LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) +-PC_FILE :=3D $(shell pkg-config --path libdpdk) +-CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) +-LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) +-LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpd= k) ++PKGCONF ?=3D pkg-config ++ ++PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) ++CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) ++LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) ++LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpd= k) +=20 + build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build @@ -415 +671 @@ -index 6fecedc54..c47055813 100644 +index 49e2a5878..7ff06899f 100644 @@ -418,2 +674,2 @@ -@@ -20,5 +20,5 @@ static: build/$(APP)-static - PKGCONF ?=3D pkg-config +@@ -18,8 +18,10 @@ static: build/$(APP)-static + =09ln -sf $(APP)-static build/$(APP) @@ -421,4 +677,12 @@ --PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk) -+PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) - CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) - LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) +-PC_FILE :=3D $(shell pkg-config --path libdpdk) +-CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) +-LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) +-LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpd= k) ++PKGCONF ?=3D pkg-config ++ ++PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) ++CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) ++LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) ++LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpd= k) +=20 + build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build @@ -426 +690 @@ -index fdc458c91..2c29004d7 100644 +index f58c8903d..3ad8fb215 100644 @@ -429,2 +693,2 @@ -@@ -20,5 +20,5 @@ static: build/$(APP)-static - PKGCONF ?=3D pkg-config +@@ -18,8 +18,10 @@ static: build/$(APP)-static + =09ln -sf $(APP)-static build/$(APP) @@ -432,4 +696,12 @@ --PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk) -+PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) - CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) - LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) +-PC_FILE :=3D $(shell pkg-config --path libdpdk) +-CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) +-LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) +-LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpd= k) ++PKGCONF ?=3D pkg-config ++ ++PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) ++CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) ++LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) ++LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpd= k) +=20 + build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build @@ -437 +709 @@ -index 57af4e7cc..645112498 100644 +index 5f76a97ef..2ace3103c 100644 @@ -440,2 +712,2 @@ -@@ -22,5 +22,5 @@ LDFLAGS +=3D -pthread - PKGCONF ?=3D pkg-config +@@ -20,8 +20,10 @@ static: build/$(APP)-static + LDFLAGS +=3D -pthread @@ -443,4 +715,12 @@ --PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk) -+PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) - CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) - LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) +-PC_FILE :=3D $(shell pkg-config --path libdpdk) +-CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) +-LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) +-LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpd= k) ++PKGCONF ?=3D pkg-config ++ ++PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) ++CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) ++LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) ++LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpd= k) +=20 + CFLAGS +=3D -DALLOW_EXPERIMENTAL_API @@ -448 +728 @@ -index 21f05918c..bf86339ab 100644 +index 3e8a14261..635e47d1d 100644 @@ -451,2 +731,2 @@ -@@ -20,5 +20,5 @@ static: build/$(APP)-static - PKGCONF ?=3D pkg-config +@@ -18,8 +18,10 @@ static: build/$(APP)-static + =09ln -sf $(APP)-static build/$(APP) @@ -454,10 +734,10 @@ --PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk) -+PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) - CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) - LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) -diff --git a/examples/vdpa/Makefile b/examples/vdpa/Makefile -index 68d088f22..6a25497cd 100644 ---- a/examples/vdpa/Makefile -+++ b/examples/vdpa/Makefile -@@ -21,5 +21,5 @@ static: build/$(APP)-static - PKGCONF ?=3D pkg-config +-PC_FILE :=3D $(shell pkg-config --path libdpdk) +-CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) +-LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) +-LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpd= k) ++PKGCONF ?=3D pkg-config ++ ++PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) ++CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) ++LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) ++LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpd= k) @@ -465,4 +745 @@ --PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk) -+PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) - CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) - LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) + build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build @@ -470 +747 @@ -index fcb864d0e..f2b161541 100644 +index a8a8aba95..e43ae7793 100644 @@ -473,2 +750,2 @@ -@@ -22,5 +22,5 @@ LDFLAGS +=3D -pthread - PKGCONF ?=3D pkg-config +@@ -20,8 +20,10 @@ static: build/$(APP)-static + LDFLAGS +=3D -pthread @@ -476,9 +753,17 @@ --PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk) -+PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) - CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) - LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) -diff --git a/examples/vhost_blk/Makefile b/examples/vhost_blk/Makefile -index af2a3f87b..39244320d 100644 ---- a/examples/vhost_blk/Makefile -+++ b/examples/vhost_blk/Makefile -@@ -23,5 +23,5 @@ PKGCONF ?=3D pkg-config +-PC_FILE :=3D $(shell pkg-config --path libdpdk) +-CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) +-LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) +-LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpd= k) ++PKGCONF ?=3D pkg-config ++ ++PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) ++CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) ++LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) ++LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpd= k) +=20 + CFLAGS +=3D -DALLOW_EXPERIMENTAL_API +diff --git a/examples/vhost_scsi/Makefile b/examples/vhost_scsi/Makefile +index 69e102de5..2911acf27 100644 +--- a/examples/vhost_scsi/Makefile ++++ b/examples/vhost_scsi/Makefile +@@ -21,8 +21,8 @@ CFLAGS +=3D -D_FILE_OFFSET_BITS=3D64 @@ -487,10 +772,8 @@ --PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk) -+PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) - CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) - LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) -diff --git a/examples/vhost_crypto/Makefile b/examples/vhost_crypto/Makefi= le -index 43e2e3244..ae8cb81f8 100644 ---- a/examples/vhost_crypto/Makefile -+++ b/examples/vhost_crypto/Makefile -@@ -21,5 +21,5 @@ static: build/$(APP)-static - PKGCONF ?=3D pkg-config +-PC_FILE :=3D $(shell pkg-config --path libdpdk) +-CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) +-LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) +-LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpd= k) ++PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) ++CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) ++LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) ++LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpd= k) @@ -498,4 +781 @@ --PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk) -+PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) - CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) - LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) + build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build @@ -503 +783 @@ -index e0f1e4c40..0767c715a 100644 +index a9983a184..e4315ac2b 100644 @@ -506,2 +786,2 @@ -@@ -20,5 +20,5 @@ static: build/$(APP)-static - PKGCONF ?=3D pkg-config +@@ -18,8 +18,10 @@ static: build/$(APP)-static + =09ln -sf $(APP)-static build/$(APP) @@ -509,4 +789,12 @@ --PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk) -+PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) - CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) - LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) +-PC_FILE :=3D $(shell pkg-config --path libdpdk) +-CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) +-LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) +-LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpd= k) ++PKGCONF ?=3D pkg-config ++ ++PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) ++CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) ++LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) ++LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpd= k) +=20 + build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build @@ -514 +802 @@ -index def515872..2a9b04143 100644 +index 5a8934c84..937002976 100644 @@ -517,2 +805,2 @@ -@@ -20,5 +20,5 @@ static: build/$(APP)-static - PKGCONF ?=3D pkg-config +@@ -18,8 +18,10 @@ static: build/$(APP)-static + =09ln -sf $(APP)-static build/$(APP) @@ -520,4 +808,12 @@ --PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk) -+PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) - CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) - LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) +-PC_FILE :=3D $(shell pkg-config --path libdpdk) +-CFLAGS +=3D -O3 $(shell pkg-config --cflags libdpdk) +-LDFLAGS_SHARED =3D $(shell pkg-config --libs libdpdk) +-LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell pkg-config --static --libs libdpd= k) ++PKGCONF ?=3D pkg-config ++ ++PC_FILE :=3D $(shell $(PKGCONF) --path libdpdk 2>/dev/null) ++CFLAGS +=3D -O3 $(shell $(PKGCONF) --cflags libdpdk) ++LDFLAGS_SHARED =3D $(shell $(PKGCONF) --libs libdpdk) ++LDFLAGS_STATIC =3D -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpd= k) +=20 + build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build