Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/63045/?format=api
{ "id": 63045, "url": "http://patches.dpdk.org/api/patches/63045/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20191115151700.64354-2-bruce.richardson@intel.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20191115151700.64354-2-bruce.richardson@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20191115151700.64354-2-bruce.richardson@intel.com", "date": "2019-11-15T15:16:59", "name": "[v2,1/2] devtools: fix example builds with older pkg-config", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "09049c75795cd95631b4bc67e75f4d5320adb490", "submitter": { "id": 20, "url": "http://patches.dpdk.org/api/people/20/?format=api", "name": "Bruce Richardson", "email": "bruce.richardson@intel.com" }, "delegate": { "id": 1, "url": "http://patches.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20191115151700.64354-2-bruce.richardson@intel.com/mbox/", "series": [ { "id": 7478, "url": "http://patches.dpdk.org/api/series/7478/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=7478", "date": "2019-11-15T15:16:58", "name": "support older pkg-config", "version": 2, "mbox": "http://patches.dpdk.org/series/7478/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/63045/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/63045/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id DB510A04C6;\n\tFri, 15 Nov 2019 16:17:24 +0100 (CET)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 85C712C60;\n\tFri, 15 Nov 2019 16:17:21 +0100 (CET)", "from mga12.intel.com (mga12.intel.com [192.55.52.136])\n by dpdk.org (Postfix) with ESMTP id 973F42C30;\n Fri, 15 Nov 2019 16:17:17 +0100 (CET)", "from orsmga004.jf.intel.com ([10.7.209.38])\n by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n 15 Nov 2019 07:17:17 -0800", "from silpixa00399126.ir.intel.com (HELO\n silpixa00399126.ger.corp.intel.com) ([10.237.223.2])\n by orsmga004.jf.intel.com with ESMTP; 15 Nov 2019 07:17:15 -0800" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.68,308,1569308400\"; d=\"scan'208\";a=\"356133521\"", "From": "Bruce Richardson <bruce.richardson@intel.com>", "To": "dev@dpdk.org", "Cc": "ferruh.yigit@intel.com, Bruce Richardson <bruce.richardson@intel.com>,\n 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>\n <20191115151700.64354-1-bruce.richardson@intel.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH v2 1/2] devtools: fix example builds with older\n\tpkg-config", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Not all versions of pkg-config in distros have support for the\n--define-prefix flag [1], causing errors when building examples manually or\nwith test-meson-builds.sh script [2].\n\nFor the former case, we need to remove the hard-coded use of the flag in\nthe Makefiles.\n\nFor the latter case, the flag is necessary for builds to succeed, so we\nskip the tests when it's not present, passing it as part of the pkg-config\ncommand if it is supported.\n\n[1]\nCentOS Linux release 7.7.1908 (Core)\npkg-config version 0.27.1\n\n[2]\n ## Building cmdline\nUnknown option --define-prefix\ngmake: Entering directory\n`...ild-x86-default/install-root/usr/local/share/dpdk/examples/cmdline'\nrm -f build/cmdline build/cmdline-static build/cmdline-shared\ntest -d build && rmdir -p build || true\nUnknown option --define-prefix\nUnknown option --define-prefix\ngcc -O3 main.c commands.c parse_obj_list.c -o build/cmdline-shared\nmain.c:14:28: fatal error: cmdline_rdline.h: No such file or directory\n\nFixes: ca9268529d2b (\"examples: support relocated DPDK install\")\nFixes: 7f80a2102bbb (\"devtools: test pkg-config file\")\nCc: stable@dpdk.org\n\nReported-by: Ferruh Yigit <ferruh.yigit@intel.com>\nSigned-off-by: Bruce Richardson <bruce.richardson@intel.com>\n---\n devtools/test-meson-builds.sh | 12 ++++++++----\n examples/bbdev_app/Makefile | 2 +-\n examples/bond/Makefile | 2 +-\n examples/cmdline/Makefile | 2 +-\n examples/distributor/Makefile | 2 +-\n examples/eventdev_pipeline/Makefile | 2 +-\n examples/fips_validation/Makefile | 2 +-\n examples/flow_classify/Makefile | 2 +-\n examples/flow_filtering/Makefile | 2 +-\n examples/helloworld/Makefile | 2 +-\n examples/ioat/Makefile | 10 ++++++----\n examples/ip_fragmentation/Makefile | 2 +-\n examples/ip_pipeline/Makefile | 2 +-\n examples/ip_reassembly/Makefile | 2 +-\n examples/ipsec-secgw/Makefile | 2 +-\n examples/ipv4_multicast/Makefile | 2 +-\n examples/kni/Makefile | 2 +-\n examples/l2fwd-cat/Makefile | 2 +-\n examples/l2fwd-crypto/Makefile | 2 +-\n examples/l2fwd-event/Makefile | 2 +-\n examples/l2fwd-jobstats/Makefile | 2 +-\n examples/l2fwd-keepalive/Makefile | 2 +-\n examples/l2fwd/Makefile | 2 +-\n examples/l3fwd-acl/Makefile | 2 +-\n examples/l3fwd-power/Makefile | 2 +-\n examples/l3fwd/Makefile | 2 +-\n examples/link_status_interrupt/Makefile | 2 +-\n examples/ntb/Makefile | 10 ++++++----\n examples/packet_ordering/Makefile | 2 +-\n examples/ptpclient/Makefile | 2 +-\n examples/qos_meter/Makefile | 2 +-\n examples/qos_sched/Makefile | 2 +-\n examples/rxtx_callbacks/Makefile | 2 +-\n examples/service_cores/Makefile | 2 +-\n examples/skeleton/Makefile | 2 +-\n examples/tep_termination/Makefile | 2 +-\n examples/timer/Makefile | 2 +-\n examples/vdpa/Makefile | 2 +-\n examples/vhost/Makefile | 2 +-\n examples/vhost_blk/Makefile | 10 ++++++----\n examples/vhost_crypto/Makefile | 2 +-\n examples/vmdq/Makefile | 2 +-\n examples/vmdq_dcb/Makefile | 2 +-\n 43 files changed, 65 insertions(+), 55 deletions(-)", "diff": "diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh\nindex 08e83eb5c..e3a5a5d51 100755\n--- a/devtools/test-meson-builds.sh\n+++ b/devtools/test-meson-builds.sh\n@@ -133,7 +133,11 @@ load_env cc\n pc_file=$(find $DESTDIR -name libdpdk.pc)\n export PKG_CONFIG_PATH=$(dirname $pc_file):$PKG_CONFIG_PATH\n \n-for example in cmdline helloworld l2fwd l3fwd skeleton timer; do\n-\techo \"## Building $example\"\n-\t$MAKE -C $DESTDIR/usr/local/share/dpdk/examples/$example clean all\n-done\n+# if pkg-config defines the necessary flags, test building some examples\n+if pkg-config --define-prefix libdpdk >/dev/null 2>&1; then\n+\texport PKGCONF=\"pkg-config --define-prefix\"\n+\tfor example in cmdline helloworld l2fwd l3fwd skeleton timer; do\n+\t\techo \"## Building $example\"\n+\t\t$MAKE -C $DESTDIR/usr/local/share/dpdk/examples/$example clean all\n+\tdone\n+fi\ndiff --git a/examples/bbdev_app/Makefile b/examples/bbdev_app/Makefile\nindex 715c521a9..033f5aada 100644\n--- a/examples/bbdev_app/Makefile\n+++ b/examples/bbdev_app/Makefile\n@@ -17,7 +17,7 @@ shared: build/$(APP)-shared\n static: build/$(APP)-static\n \tln -sf $(APP)-static build/$(APP)\n \n-PKGCONF=pkg-config --define-prefix\n+PKGCONF ?= pkg-config\n \n PC_FILE := $(shell $(PKGCONF) --path libdpdk)\n CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)\ndiff --git a/examples/bond/Makefile b/examples/bond/Makefile\nindex 0229b31bb..3f1ae1b6f 100644\n--- a/examples/bond/Makefile\n+++ b/examples/bond/Makefile\n@@ -19,7 +19,7 @@ static: build/$(APP)-static\n \n LDFLAGS += -lrte_pmd_bond\n \n-PKGCONF=pkg-config --define-prefix\n+PKGCONF ?= pkg-config\n \n PC_FILE := $(shell $(PKGCONF) --path libdpdk)\n CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)\ndiff --git a/examples/cmdline/Makefile b/examples/cmdline/Makefile\nindex c1852080a..f362a2afb 100644\n--- a/examples/cmdline/Makefile\n+++ b/examples/cmdline/Makefile\n@@ -17,7 +17,7 @@ shared: build/$(APP)-shared\n static: build/$(APP)-static\n \tln -sf $(APP)-static build/$(APP)\n \n-PKGCONF=pkg-config --define-prefix\n+PKGCONF ?= pkg-config\n \n PC_FILE := $(shell $(PKGCONF) --path libdpdk)\n CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)\ndiff --git a/examples/distributor/Makefile b/examples/distributor/Makefile\nindex bac8d5578..ac804da34 100644\n--- a/examples/distributor/Makefile\n+++ b/examples/distributor/Makefile\n@@ -17,7 +17,7 @@ shared: build/$(APP)-shared\n static: build/$(APP)-static\n \tln -sf $(APP)-static build/$(APP)\n \n-PKGCONF=pkg-config --define-prefix\n+PKGCONF ?= pkg-config\n \n PC_FILE := $(shell $(PKGCONF) --path libdpdk)\n CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)\ndiff --git a/examples/eventdev_pipeline/Makefile b/examples/eventdev_pipeline/Makefile\nindex 205145853..9a6250b85 100644\n--- a/examples/eventdev_pipeline/Makefile\n+++ b/examples/eventdev_pipeline/Makefile\n@@ -19,7 +19,7 @@ shared: build/$(APP)-shared\n static: build/$(APP)-static\n \tln -sf $(APP)-static build/$(APP)\n \n-PKGCONF=pkg-config --define-prefix\n+PKGCONF ?= pkg-config\n \n PC_FILE := $(shell $(PKGCONF) --path libdpdk)\n CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)\ndiff --git a/examples/fips_validation/Makefile b/examples/fips_validation/Makefile\nindex 9485daf7a..da5c8f6e7 100644\n--- a/examples/fips_validation/Makefile\n+++ b/examples/fips_validation/Makefile\n@@ -26,7 +26,7 @@ shared: build/$(APP)-shared\n static: build/$(APP)-static\n \tln -sf $(APP)-static build/$(APP)\n \n-PKGCONF=pkg-config --define-prefix\n+PKGCONF ?= pkg-config\n \n PC_FILE := $(shell $(PKGCONF) --path libdpdk)\n CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)\ndiff --git a/examples/flow_classify/Makefile b/examples/flow_classify/Makefile\nindex 4c23e5c6d..0b41ac4eb 100644\n--- a/examples/flow_classify/Makefile\n+++ b/examples/flow_classify/Makefile\n@@ -17,7 +17,7 @@ shared: build/$(APP)-shared\n static: build/$(APP)-static\n \tln -sf $(APP)-static build/$(APP)\n \n-PKGCONF=pkg-config --define-prefix\n+PKGCONF ?= pkg-config\n \n PC_FILE := $(shell $(PKGCONF) --path libdpdk)\n CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)\ndiff --git a/examples/flow_filtering/Makefile b/examples/flow_filtering/Makefile\nindex a63a75555..1d5ab739c 100644\n--- a/examples/flow_filtering/Makefile\n+++ b/examples/flow_filtering/Makefile\n@@ -15,7 +15,7 @@ shared: build/$(APP)-shared\n static: build/$(APP)-static\n \tln -sf $(APP)-static build/$(APP)\n \n-PKGCONF=pkg-config --define-prefix\n+PKGCONF ?= pkg-config\n \n PC_FILE := $(shell $(PKGCONF) --path libdpdk)\n CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)\ndiff --git a/examples/helloworld/Makefile b/examples/helloworld/Makefile\nindex 403afa050..267f90b4e 100644\n--- a/examples/helloworld/Makefile\n+++ b/examples/helloworld/Makefile\n@@ -17,7 +17,7 @@ shared: build/$(APP)-shared\n static: build/$(APP)-static\n \tln -sf $(APP)-static build/$(APP)\n \n-PKGCONF=pkg-config --define-prefix\n+PKGCONF ?= pkg-config\n \n PC_FILE := $(shell $(PKGCONF) --path libdpdk)\n CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)\ndiff --git a/examples/ioat/Makefile b/examples/ioat/Makefile\nindex 2a4d1da2d..ad4c63e31 100644\n--- a/examples/ioat/Makefile\n+++ b/examples/ioat/Makefile\n@@ -17,10 +17,12 @@ shared: build/$(APP)-shared\n static: build/$(APP)-static\n \tln -sf $(APP)-static build/$(APP)\n \n-PC_FILE := $(shell pkg-config --path libdpdk)\n-CFLAGS += -O3 $(shell pkg-config --cflags libdpdk)\n-LDFLAGS_SHARED = $(shell pkg-config --libs libdpdk)\n-LDFLAGS_STATIC = -Wl,-Bstatic $(shell pkg-config --static --libs libdpdk)\n+PKGCONF ?= pkg-config\n+\n+PC_FILE := $(shell $(PKGCONF) --path libdpdk)\n+CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)\n+LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk)\n+LDFLAGS_STATIC = -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk)\n \n build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build\n \t$(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED)\ndiff --git a/examples/ip_fragmentation/Makefile b/examples/ip_fragmentation/Makefile\nindex 6af25a02e..1d1396211 100644\n--- a/examples/ip_fragmentation/Makefile\n+++ b/examples/ip_fragmentation/Makefile\n@@ -18,7 +18,7 @@ shared: build/$(APP)-shared\n static: build/$(APP)-static\n \tln -sf $(APP)-static build/$(APP)\n \n-PKGCONF=pkg-config --define-prefix\n+PKGCONF ?= pkg-config\n \n PC_FILE := $(shell $(PKGCONF) --path libdpdk)\n CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)\ndiff --git a/examples/ip_pipeline/Makefile b/examples/ip_pipeline/Makefile\nindex cf10d7180..77d37cc40 100644\n--- a/examples/ip_pipeline/Makefile\n+++ b/examples/ip_pipeline/Makefile\n@@ -30,7 +30,7 @@ shared: build/$(APP)-shared\n static: build/$(APP)-static\n \tln -sf $(APP)-static build/$(APP)\n \n-PKGCONF=pkg-config --define-prefix\n+PKGCONF ?= pkg-config\n \n PC_FILE := $(shell $(PKGCONF) --path libdpdk)\n CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)\ndiff --git a/examples/ip_reassembly/Makefile b/examples/ip_reassembly/Makefile\nindex 0b1a904e0..3d7fac195 100644\n--- a/examples/ip_reassembly/Makefile\n+++ b/examples/ip_reassembly/Makefile\n@@ -18,7 +18,7 @@ shared: build/$(APP)-shared\n static: build/$(APP)-static\n \tln -sf $(APP)-static build/$(APP)\n \n-PKGCONF=pkg-config --define-prefix\n+PKGCONF ?= pkg-config\n \n PC_FILE := $(shell $(PKGCONF) --path libdpdk)\n CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)\ndiff --git a/examples/ipsec-secgw/Makefile b/examples/ipsec-secgw/Makefile\nindex 851123be5..1c2b944d6 100644\n--- a/examples/ipsec-secgw/Makefile\n+++ b/examples/ipsec-secgw/Makefile\n@@ -28,7 +28,7 @@ shared: build/$(APP)-shared\n static: build/$(APP)-static\n \tln -sf $(APP)-static build/$(APP)\n \n-PKGCONF=pkg-config --define-prefix\n+PKGCONF ?= pkg-config\n \n PC_FILE := $(shell $(PKGCONF) --path libdpdk)\n CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)\ndiff --git a/examples/ipv4_multicast/Makefile b/examples/ipv4_multicast/Makefile\nindex 5f8a67dd4..5f9d73881 100644\n--- a/examples/ipv4_multicast/Makefile\n+++ b/examples/ipv4_multicast/Makefile\n@@ -18,7 +18,7 @@ shared: build/$(APP)-shared\n static: build/$(APP)-static\n \tln -sf $(APP)-static build/$(APP)\n \n-PKGCONF=pkg-config --define-prefix\n+PKGCONF ?= pkg-config\n \n PC_FILE := $(shell $(PKGCONF) --path libdpdk)\n CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)\ndiff --git a/examples/kni/Makefile b/examples/kni/Makefile\nindex 5dc8118e3..fbe0097cf 100644\n--- a/examples/kni/Makefile\n+++ b/examples/kni/Makefile\n@@ -17,7 +17,7 @@ shared: build/$(APP)-shared\n static: build/$(APP)-static\n \tln -sf $(APP)-static build/$(APP)\n \n-PKGCONF=pkg-config --define-prefix\n+PKGCONF ?= pkg-config\n \n PC_FILE := $(shell $(PKGCONF) --path libdpdk)\n CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)\ndiff --git a/examples/l2fwd-cat/Makefile b/examples/l2fwd-cat/Makefile\nindex c1960d6d3..86e56a1e7 100644\n--- a/examples/l2fwd-cat/Makefile\n+++ b/examples/l2fwd-cat/Makefile\n@@ -17,7 +17,7 @@ shared: build/$(APP)-shared\n static: build/$(APP)-static\n \tln -sf $(APP)-static build/$(APP)\n \n-PKGCONF=pkg-config --define-prefix\n+PKGCONF ?= pkg-config\n \n PC_FILE := $(shell $(PKGCONF) --path libdpdk)\n CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)\ndiff --git a/examples/l2fwd-crypto/Makefile b/examples/l2fwd-crypto/Makefile\nindex 29fd530b4..ecfbab1f5 100644\n--- a/examples/l2fwd-crypto/Makefile\n+++ b/examples/l2fwd-crypto/Makefile\n@@ -17,7 +17,7 @@ shared: build/$(APP)-shared\n static: build/$(APP)-static\n \tln -sf $(APP)-static build/$(APP)\n \n-PKGCONF=pkg-config --define-prefix\n+PKGCONF ?= pkg-config\n \n PC_FILE := $(shell $(PKGCONF) --path libdpdk)\n CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)\ndiff --git a/examples/l2fwd-event/Makefile b/examples/l2fwd-event/Makefile\nindex 6f4176882..04e6796a6 100644\n--- a/examples/l2fwd-event/Makefile\n+++ b/examples/l2fwd-event/Makefile\n@@ -23,7 +23,7 @@ shared: build/$(APP)-shared\n static: build/$(APP)-static\n \tln -sf $(APP)-static build/$(APP)\n \n-PKGCONF=pkg-config --define-prefix\n+PKGCONF ?= pkg-config\n \n PC_FILE := $(shell $(PKGCONF) --path libdpdk)\n CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)\ndiff --git a/examples/l2fwd-jobstats/Makefile b/examples/l2fwd-jobstats/Makefile\nindex 729a39e93..0882c2697 100644\n--- a/examples/l2fwd-jobstats/Makefile\n+++ b/examples/l2fwd-jobstats/Makefile\n@@ -17,7 +17,7 @@ shared: build/$(APP)-shared\n static: build/$(APP)-static\n \tln -sf $(APP)-static build/$(APP)\n \n-PKGCONF=pkg-config --define-prefix\n+PKGCONF ?= pkg-config\n \n PC_FILE := $(shell $(PKGCONF) --path libdpdk)\n CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)\ndiff --git a/examples/l2fwd-keepalive/Makefile b/examples/l2fwd-keepalive/Makefile\nindex 37de27a6f..68e467426 100644\n--- a/examples/l2fwd-keepalive/Makefile\n+++ b/examples/l2fwd-keepalive/Makefile\n@@ -19,7 +19,7 @@ static: build/$(APP)-static\n \n LDFLAGS += -pthread -lrt\n \n-PKGCONF=pkg-config --define-prefix\n+PKGCONF ?= pkg-config\n \n PC_FILE := $(shell $(PKGCONF) --path libdpdk)\n CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)\ndiff --git a/examples/l2fwd/Makefile b/examples/l2fwd/Makefile\nindex 9c506844e..97af55a50 100644\n--- a/examples/l2fwd/Makefile\n+++ b/examples/l2fwd/Makefile\n@@ -17,7 +17,7 @@ shared: build/$(APP)-shared\n static: build/$(APP)-static\n \tln -sf $(APP)-static build/$(APP)\n \n-PKGCONF=pkg-config --define-prefix\n+PKGCONF ?= pkg-config\n \n PC_FILE := $(shell $(PKGCONF) --path libdpdk)\n CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)\ndiff --git a/examples/l3fwd-acl/Makefile b/examples/l3fwd-acl/Makefile\nindex e2c989f71..7fcf1e7a6 100644\n--- a/examples/l3fwd-acl/Makefile\n+++ b/examples/l3fwd-acl/Makefile\n@@ -17,7 +17,7 @@ shared: build/$(APP)-shared\n static: build/$(APP)-static\n \tln -sf $(APP)-static build/$(APP)\n \n-PKGCONF=pkg-config --define-prefix\n+PKGCONF ?= pkg-config\n \n PC_FILE := $(shell $(PKGCONF) --path libdpdk)\n CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)\ndiff --git a/examples/l3fwd-power/Makefile b/examples/l3fwd-power/Makefile\nindex 98248f462..de5d15cb7 100644\n--- a/examples/l3fwd-power/Makefile\n+++ b/examples/l3fwd-power/Makefile\n@@ -17,7 +17,7 @@ shared: build/$(APP)-shared\n static: build/$(APP)-static\n \tln -sf $(APP)-static build/$(APP)\n \n-PKGCONF=pkg-config --define-prefix\n+PKGCONF ?= pkg-config\n \n PC_FILE := $(shell $(PKGCONF) --path libdpdk)\n CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)\ndiff --git a/examples/l3fwd/Makefile b/examples/l3fwd/Makefile\nindex c55f5c288..042eae92b 100644\n--- a/examples/l3fwd/Makefile\n+++ b/examples/l3fwd/Makefile\n@@ -17,7 +17,7 @@ shared: build/$(APP)-shared\n static: build/$(APP)-static\n \tln -sf $(APP)-static build/$(APP)\n \n-PKGCONF=pkg-config --define-prefix\n+PKGCONF ?= pkg-config\n \n PC_FILE := $(shell $(PKGCONF) --path libdpdk)\n CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)\ndiff --git a/examples/link_status_interrupt/Makefile b/examples/link_status_interrupt/Makefile\nindex 97e5a14a8..3d55aa1ac 100644\n--- a/examples/link_status_interrupt/Makefile\n+++ b/examples/link_status_interrupt/Makefile\n@@ -17,7 +17,7 @@ shared: build/$(APP)-shared\n static: build/$(APP)-static\n \tln -sf $(APP)-static build/$(APP)\n \n-PKGCONF=pkg-config --define-prefix\n+PKGCONF ?= pkg-config\n \n PC_FILE := $(shell $(PKGCONF) --path libdpdk)\n CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)\ndiff --git a/examples/ntb/Makefile b/examples/ntb/Makefile\nindex 5ddd9b95f..7927f44ac 100644\n--- a/examples/ntb/Makefile\n+++ b/examples/ntb/Makefile\n@@ -18,13 +18,15 @@ shared: build/$(APP)-shared\n static: build/$(APP)-static\n \tln -sf $(APP)-static build/$(APP)\n \n+PKGCONF ?= pkg-config\n+\n CFLAGS += -D_FILE_OFFSET_BITS=64\n LDFLAGS += -pthread\n \n-PC_FILE := $(shell pkg-config --path libdpdk)\n-CFLAGS += -O3 $(shell pkg-config --cflags libdpdk)\n-LDFLAGS_SHARED = $(shell pkg-config --libs libdpdk)\n-LDFLAGS_STATIC = -Wl,-Bstatic $(shell pkg-config --static --libs libdpdk)\n+PC_FILE := $(shell $(PKGCONF) --path libdpdk)\n+CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)\n+LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk)\n+LDFLAGS_STATIC = -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk)\n \n build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build\n \t$(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED)\ndiff --git a/examples/packet_ordering/Makefile b/examples/packet_ordering/Makefile\nindex 51acaf7eb..b04a39399 100644\n--- a/examples/packet_ordering/Makefile\n+++ b/examples/packet_ordering/Makefile\n@@ -17,7 +17,7 @@ shared: build/$(APP)-shared\n static: build/$(APP)-static\n \tln -sf $(APP)-static build/$(APP)\n \n-PKGCONF=pkg-config --define-prefix\n+PKGCONF ?= pkg-config\n \n PC_FILE := $(shell $(PKGCONF) --path libdpdk)\n CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)\ndiff --git a/examples/ptpclient/Makefile b/examples/ptpclient/Makefile\nindex 89e2bacbd..0f8390b68 100644\n--- a/examples/ptpclient/Makefile\n+++ b/examples/ptpclient/Makefile\n@@ -17,7 +17,7 @@ shared: build/$(APP)-shared\n static: build/$(APP)-static\n \tln -sf $(APP)-static build/$(APP)\n \n-PKGCONF=pkg-config --define-prefix\n+PKGCONF ?= pkg-config\n \n PC_FILE := $(shell $(PKGCONF) --path libdpdk)\n CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)\ndiff --git a/examples/qos_meter/Makefile b/examples/qos_meter/Makefile\nindex e5217cf7c..4a9b628b8 100644\n--- a/examples/qos_meter/Makefile\n+++ b/examples/qos_meter/Makefile\n@@ -17,7 +17,7 @@ shared: build/$(APP)-shared\n static: build/$(APP)-static\n \tln -sf $(APP)-static build/$(APP)\n \n-PKGCONF=pkg-config --define-prefix\n+PKGCONF ?= pkg-config\n \n PC_FILE := $(shell $(PKGCONF) --path libdpdk)\n CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)\ndiff --git a/examples/qos_sched/Makefile b/examples/qos_sched/Makefile\nindex ce2d25371..5737ad652 100644\n--- a/examples/qos_sched/Makefile\n+++ b/examples/qos_sched/Makefile\n@@ -17,7 +17,7 @@ shared: build/$(APP)-shared\n static: build/$(APP)-static\n \tln -sf $(APP)-static build/$(APP)\n \n-PKGCONF=pkg-config --define-prefix\n+PKGCONF ?= pkg-config\n \n PC_FILE := $(shell $(PKGCONF) --path libdpdk)\n CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)\ndiff --git a/examples/rxtx_callbacks/Makefile b/examples/rxtx_callbacks/Makefile\nindex edd5b52cd..0f126692a 100644\n--- a/examples/rxtx_callbacks/Makefile\n+++ b/examples/rxtx_callbacks/Makefile\n@@ -17,7 +17,7 @@ shared: build/$(APP)-shared\n static: build/$(APP)-static\n \tln -sf $(APP)-static build/$(APP)\n \n-PKGCONF=pkg-config --define-prefix\n+PKGCONF ?= pkg-config\n \n PC_FILE := $(shell $(PKGCONF) --path libdpdk)\n CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)\ndiff --git a/examples/service_cores/Makefile b/examples/service_cores/Makefile\nindex abbb7aed2..6fecedc54 100644\n--- a/examples/service_cores/Makefile\n+++ b/examples/service_cores/Makefile\n@@ -17,7 +17,7 @@ shared: build/$(APP)-shared\n static: build/$(APP)-static\n \tln -sf $(APP)-static build/$(APP)\n \n-PKGCONF=pkg-config --define-prefix\n+PKGCONF ?= pkg-config\n \n PC_FILE := $(shell $(PKGCONF) --path libdpdk)\n CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)\ndiff --git a/examples/skeleton/Makefile b/examples/skeleton/Makefile\nindex c5ac26029..fdc458c91 100644\n--- a/examples/skeleton/Makefile\n+++ b/examples/skeleton/Makefile\n@@ -17,7 +17,7 @@ shared: build/$(APP)-shared\n static: build/$(APP)-static\n \tln -sf $(APP)-static build/$(APP)\n \n-PKGCONF=pkg-config --define-prefix\n+PKGCONF ?= pkg-config\n \n PC_FILE := $(shell $(PKGCONF) --path libdpdk)\n CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)\ndiff --git a/examples/tep_termination/Makefile b/examples/tep_termination/Makefile\nindex 31165bd92..57af4e7cc 100644\n--- a/examples/tep_termination/Makefile\n+++ b/examples/tep_termination/Makefile\n@@ -19,7 +19,7 @@ static: build/$(APP)-static\n \n LDFLAGS += -pthread\n \n-PKGCONF=pkg-config --define-prefix\n+PKGCONF ?= pkg-config\n \n PC_FILE := $(shell $(PKGCONF) --path libdpdk)\n CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)\ndiff --git a/examples/timer/Makefile b/examples/timer/Makefile\nindex a86178355..21f05918c 100644\n--- a/examples/timer/Makefile\n+++ b/examples/timer/Makefile\n@@ -17,7 +17,7 @@ shared: build/$(APP)-shared\n static: build/$(APP)-static\n \tln -sf $(APP)-static build/$(APP)\n \n-PKGCONF=pkg-config --define-prefix\n+PKGCONF ?= pkg-config\n \n PC_FILE := $(shell $(PKGCONF) --path libdpdk)\n CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)\ndiff --git a/examples/vdpa/Makefile b/examples/vdpa/Makefile\nindex 2ac991a4b..68d088f22 100644\n--- a/examples/vdpa/Makefile\n+++ b/examples/vdpa/Makefile\n@@ -18,7 +18,7 @@ shared: build/$(APP)-shared\n static: build/$(APP)-static\n \tln -sf $(APP)-static build/$(APP)\n \n-PKGCONF=pkg-config --define-prefix\n+PKGCONF ?= pkg-config\n \n PC_FILE := $(shell $(PKGCONF) --path libdpdk)\n CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)\ndiff --git a/examples/vhost/Makefile b/examples/vhost/Makefile\nindex f84b7f017..fcb864d0e 100644\n--- a/examples/vhost/Makefile\n+++ b/examples/vhost/Makefile\n@@ -19,7 +19,7 @@ static: build/$(APP)-static\n \n LDFLAGS += -pthread\n \n-PKGCONF=pkg-config --define-prefix\n+PKGCONF ?= pkg-config\n \n PC_FILE := $(shell $(PKGCONF) --path libdpdk)\n CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)\ndiff --git a/examples/vhost_blk/Makefile b/examples/vhost_blk/Makefile\nindex a10a90071..af2a3f87b 100644\n--- a/examples/vhost_blk/Makefile\n+++ b/examples/vhost_blk/Makefile\n@@ -18,12 +18,14 @@ shared: build/$(APP)-shared\n static: build/$(APP)-static\n \tln -sf $(APP)-static build/$(APP)\n \n+PKGCONF ?= pkg-config\n+\n LDFLAGS += -pthread\n \n-PC_FILE := $(shell pkg-config --path libdpdk)\n-CFLAGS += -O3 $(shell pkg-config --cflags libdpdk)\n-LDFLAGS_SHARED = $(shell pkg-config --libs libdpdk)\n-LDFLAGS_STATIC = -Wl,-Bstatic $(shell pkg-config --static --libs libdpdk)\n+PC_FILE := $(shell $(PKGCONF) --path libdpdk)\n+CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)\n+LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk)\n+LDFLAGS_STATIC = -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk)\n \n CFLAGS += -DALLOW_EXPERIMENTAL_API\n \ndiff --git a/examples/vhost_crypto/Makefile b/examples/vhost_crypto/Makefile\nindex a9e1c4d3a..43e2e3244 100644\n--- a/examples/vhost_crypto/Makefile\n+++ b/examples/vhost_crypto/Makefile\n@@ -18,7 +18,7 @@ shared: build/$(APP)-shared\n static: build/$(APP)-static\n \tln -sf $(APP)-static build/$(APP)\n \n-PKGCONF=pkg-config --define-prefix\n+PKGCONF ?= pkg-config\n \n PC_FILE := $(shell $(PKGCONF) --path libdpdk)\n CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)\ndiff --git a/examples/vmdq/Makefile b/examples/vmdq/Makefile\nindex 1557ee86b..e0f1e4c40 100644\n--- a/examples/vmdq/Makefile\n+++ b/examples/vmdq/Makefile\n@@ -17,7 +17,7 @@ shared: build/$(APP)-shared\n static: build/$(APP)-static\n \tln -sf $(APP)-static build/$(APP)\n \n-PKGCONF=pkg-config --define-prefix\n+PKGCONF ?= pkg-config\n \n PC_FILE := $(shell $(PKGCONF) --path libdpdk)\n CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)\ndiff --git a/examples/vmdq_dcb/Makefile b/examples/vmdq_dcb/Makefile\nindex 391096cfb..def515872 100644\n--- a/examples/vmdq_dcb/Makefile\n+++ b/examples/vmdq_dcb/Makefile\n@@ -17,7 +17,7 @@ shared: build/$(APP)-shared\n static: build/$(APP)-static\n \tln -sf $(APP)-static build/$(APP)\n \n-PKGCONF=pkg-config --define-prefix\n+PKGCONF ?= pkg-config\n \n PC_FILE := $(shell $(PKGCONF) --path libdpdk)\n CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)\n", "prefixes": [ "v2", "1/2" ] }