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 1F4DEA046B for ; Fri, 23 Aug 2019 11:45:12 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 15CFF1BF4C; Fri, 23 Aug 2019 11:45:12 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id ED89A1BF4C for ; Fri, 23 Aug 2019 11:45:09 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 62FDB793CC; Fri, 23 Aug 2019 09:45:09 +0000 (UTC) Received: from rh.redhat.com (ovpn-116-48.ams2.redhat.com [10.36.116.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1EDDF5C226; Fri, 23 Aug 2019 09:45:07 +0000 (UTC) From: Kevin Traynor To: Bruce Richardson Cc: Luca Boccassi , dpdk stable Date: Fri, 23 Aug 2019 10:43:27 +0100 Message-Id: <20190823094336.12078-37-ktraynor@redhat.com> In-Reply-To: <20190823094336.12078-1-ktraynor@redhat.com> References: <20190823094336.12078-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Fri, 23 Aug 2019 09:45:09 +0000 (UTC) Subject: [dpdk-stable] patch 'examples: fix pkg-config detection with older make' has been queued to LTS release 18.11.3 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.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/28/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 rebasing (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/d9760a99aeacd67c3400390119cc87b8bb98ce27 Thanks. Kevin Traynor --- >From d9760a99aeacd67c3400390119cc87b8bb98ce27 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Wed, 3 Jul 2019 17:40:00 +0100 Subject: [PATCH] examples: fix pkg-config detection with older make [ upstream commit 4131ad5db79a016970287282b938ebed2f19bdb3 ] Make versions before 4.2 did not have support for the .SHELLSTATUS variable, so use another method to detect shell success. Fixes: 22119c4591a0 ("examples: use pkg-config in makefiles") Signed-off-by: Bruce Richardson Acked-by: Luca Boccassi --- examples/bbdev_app/Makefile | 3 +-- examples/bond/Makefile | 3 +-- examples/cmdline/Makefile | 3 +-- examples/distributor/Makefile | 3 +-- examples/eventdev_pipeline/Makefile | 3 +-- examples/exception_path/Makefile | 3 +-- examples/fips_validation/Makefile | 3 +-- examples/flow_classify/Makefile | 3 +-- examples/flow_filtering/Makefile | 3 +-- examples/helloworld/Makefile | 3 +-- examples/ip_fragmentation/Makefile | 3 +-- examples/ip_pipeline/Makefile | 3 +-- examples/ip_reassembly/Makefile | 3 +-- examples/ipsec-secgw/Makefile | 3 +-- examples/ipv4_multicast/Makefile | 3 +-- examples/kni/Makefile | 3 +-- examples/l2fwd-cat/Makefile | 3 +-- examples/l2fwd-crypto/Makefile | 3 +-- examples/l2fwd-jobstats/Makefile | 3 +-- examples/l2fwd-keepalive/Makefile | 3 +-- examples/l2fwd/Makefile | 3 +-- examples/l3fwd-acl/Makefile | 3 +-- examples/l3fwd-power/Makefile | 3 +-- examples/l3fwd-vf/Makefile | 3 +-- examples/l3fwd/Makefile | 3 +-- examples/link_status_interrupt/Makefile | 3 +-- examples/load_balancer/Makefile | 3 +-- examples/packet_ordering/Makefile | 3 +-- examples/ptpclient/Makefile | 3 +-- examples/qos_meter/Makefile | 3 +-- examples/qos_sched/Makefile | 3 +-- examples/rxtx_callbacks/Makefile | 3 +-- examples/service_cores/Makefile | 3 +-- examples/skeleton/Makefile | 3 +-- examples/tep_termination/Makefile | 3 +-- examples/timer/Makefile | 3 +-- examples/vhost/Makefile | 3 +-- examples/vhost_scsi/Makefile | 3 +-- examples/vmdq/Makefile | 3 +-- examples/vmdq_dcb/Makefile | 3 +-- 40 files changed, 40 insertions(+), 80 deletions(-) diff --git a/examples/bbdev_app/Makefile b/examples/bbdev_app/Makefile index c149589bc..378b4cb54 100644 --- a/examples/bbdev_app/Makefile +++ b/examples/bbdev_app/Makefile @@ -9,6 +9,5 @@ SRCS-y := main.c # Build using pkg-config variables if possible -$(shell pkg-config --exists libdpdk) -ifeq ($(.SHELLSTATUS),0) +ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) all: shared diff --git a/examples/bond/Makefile b/examples/bond/Makefile index 2511b71eb..665fcf6a3 100644 --- a/examples/bond/Makefile +++ b/examples/bond/Makefile @@ -9,6 +9,5 @@ SRCS-y := main.c # Build using pkg-config variables if possible -$(shell pkg-config --exists libdpdk) -ifeq ($(.SHELLSTATUS),0) +ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) all: shared diff --git a/examples/cmdline/Makefile b/examples/cmdline/Makefile index d4180406e..fbe521c39 100644 --- a/examples/cmdline/Makefile +++ b/examples/cmdline/Makefile @@ -9,6 +9,5 @@ SRCS-y := main.c commands.c parse_obj_list.c # Build using pkg-config variables if possible -$(shell pkg-config --exists libdpdk) -ifeq ($(.SHELLSTATUS),0) +ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) all: shared diff --git a/examples/distributor/Makefile b/examples/distributor/Makefile index 02656e326..372446f9c 100644 --- a/examples/distributor/Makefile +++ b/examples/distributor/Makefile @@ -9,6 +9,5 @@ SRCS-y := main.c # Build using pkg-config variables if possible -$(shell pkg-config --exists libdpdk) -ifeq ($(.SHELLSTATUS),0) +ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) all: shared diff --git a/examples/eventdev_pipeline/Makefile b/examples/eventdev_pipeline/Makefile index 12e3f262b..cab4d4050 100644 --- a/examples/eventdev_pipeline/Makefile +++ b/examples/eventdev_pipeline/Makefile @@ -11,6 +11,5 @@ SRCS-y += pipeline_worker_tx.c # Build using pkg-config variables if possible -$(shell pkg-config --exists libdpdk) -ifeq ($(.SHELLSTATUS),0) +ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) all: shared diff --git a/examples/exception_path/Makefile b/examples/exception_path/Makefile index 6f52213ed..013ae1cbe 100644 --- a/examples/exception_path/Makefile +++ b/examples/exception_path/Makefile @@ -9,6 +9,5 @@ SRCS-y := main.c # Build using pkg-config variables if possible -$(shell pkg-config --exists libdpdk) -ifeq ($(.SHELLSTATUS),0) +ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) all: shared diff --git a/examples/fips_validation/Makefile b/examples/fips_validation/Makefile index 2e30ab266..5fb64e4d9 100644 --- a/examples/fips_validation/Makefile +++ b/examples/fips_validation/Makefile @@ -16,6 +16,5 @@ SRCS-y += main.c # Build using pkg-config variables if possible -$(shell pkg-config --exists libdpdk) -ifeq ($(.SHELLSTATUS),0) +ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) all: shared diff --git a/examples/flow_classify/Makefile b/examples/flow_classify/Makefile index 08bf71272..5c0f7fc57 100644 --- a/examples/flow_classify/Makefile +++ b/examples/flow_classify/Makefile @@ -9,6 +9,5 @@ SRCS-y := flow_classify.c # Build using pkg-config variables if possible -$(shell pkg-config --exists libdpdk) -ifeq ($(.SHELLSTATUS),0) +ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) all: shared diff --git a/examples/flow_filtering/Makefile b/examples/flow_filtering/Makefile index 619ed53b7..5140f5079 100644 --- a/examples/flow_filtering/Makefile +++ b/examples/flow_filtering/Makefile @@ -7,6 +7,5 @@ SRCS-y := main.c # Build using pkg-config variables if possible -$(shell pkg-config --exists libdpdk) -ifeq ($(.SHELLSTATUS),0) +ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) all: shared diff --git a/examples/helloworld/Makefile b/examples/helloworld/Makefile index 9cf7c4e7c..970c9ea80 100644 --- a/examples/helloworld/Makefile +++ b/examples/helloworld/Makefile @@ -9,6 +9,5 @@ SRCS-y := main.c # Build using pkg-config variables if possible -$(shell pkg-config --exists libdpdk) -ifeq ($(.SHELLSTATUS),0) +ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) all: shared diff --git a/examples/ip_fragmentation/Makefile b/examples/ip_fragmentation/Makefile index de9281677..84e66f239 100644 --- a/examples/ip_fragmentation/Makefile +++ b/examples/ip_fragmentation/Makefile @@ -10,6 +10,5 @@ SRCS-y := main.c # Build using pkg-config variables if possible -$(shell pkg-config --exists libdpdk) -ifeq ($(.SHELLSTATUS),0) +ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) all: shared diff --git a/examples/ip_pipeline/Makefile b/examples/ip_pipeline/Makefile index 1e03befeb..d667af811 100644 --- a/examples/ip_pipeline/Makefile +++ b/examples/ip_pipeline/Makefile @@ -22,6 +22,5 @@ SRCS-y += cryptodev.c # Build using pkg-config variables if possible -$(shell pkg-config --exists libdpdk) -ifeq ($(.SHELLSTATUS),0) +ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) all: shared diff --git a/examples/ip_reassembly/Makefile b/examples/ip_reassembly/Makefile index 8b2a158af..ad7e5feae 100644 --- a/examples/ip_reassembly/Makefile +++ b/examples/ip_reassembly/Makefile @@ -10,6 +10,5 @@ SRCS-y := main.c # Build using pkg-config variables if possible -$(shell pkg-config --exists libdpdk) -ifeq ($(.SHELLSTATUS),0) +ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) all: shared diff --git a/examples/ipsec-secgw/Makefile b/examples/ipsec-secgw/Makefile index 9e19c2519..3fd2079df 100644 --- a/examples/ipsec-secgw/Makefile +++ b/examples/ipsec-secgw/Makefile @@ -19,6 +19,5 @@ CFLAGS += -gdwarf-2 # Build using pkg-config variables if possible -$(shell pkg-config --exists libdpdk) -ifeq ($(.SHELLSTATUS),0) +ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) all: shared diff --git a/examples/ipv4_multicast/Makefile b/examples/ipv4_multicast/Makefile index f840f1642..83a21feba 100644 --- a/examples/ipv4_multicast/Makefile +++ b/examples/ipv4_multicast/Makefile @@ -10,6 +10,5 @@ SRCS-y := main.c # Build using pkg-config variables if possible -$(shell pkg-config --exists libdpdk) -ifeq ($(.SHELLSTATUS),0) +ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) all: shared diff --git a/examples/kni/Makefile b/examples/kni/Makefile index 3b9bacb7c..6c3e30396 100644 --- a/examples/kni/Makefile +++ b/examples/kni/Makefile @@ -9,6 +9,5 @@ SRCS-y := main.c # Build using pkg-config variables if possible -$(shell pkg-config --exists libdpdk) -ifeq ($(.SHELLSTATUS),0) +ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) all: shared diff --git a/examples/l2fwd-cat/Makefile b/examples/l2fwd-cat/Makefile index b80f73014..3c39ed6db 100644 --- a/examples/l2fwd-cat/Makefile +++ b/examples/l2fwd-cat/Makefile @@ -9,6 +9,5 @@ SRCS-y := l2fwd-cat.c cat.c # Build using pkg-config variables if possible -$(shell pkg-config --exists libdpdk) -ifeq ($(.SHELLSTATUS),0) +ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) all: shared diff --git a/examples/l2fwd-crypto/Makefile b/examples/l2fwd-crypto/Makefile index 5c2fd3c05..21fd8eeae 100644 --- a/examples/l2fwd-crypto/Makefile +++ b/examples/l2fwd-crypto/Makefile @@ -9,6 +9,5 @@ SRCS-y := main.c # Build using pkg-config variables if possible -$(shell pkg-config --exists libdpdk) -ifeq ($(.SHELLSTATUS),0) +ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) all: shared diff --git a/examples/l2fwd-jobstats/Makefile b/examples/l2fwd-jobstats/Makefile index 7fb0a2618..aec35390e 100644 --- a/examples/l2fwd-jobstats/Makefile +++ b/examples/l2fwd-jobstats/Makefile @@ -9,6 +9,5 @@ SRCS-y := main.c # Build using pkg-config variables if possible -$(shell pkg-config --exists libdpdk) -ifeq ($(.SHELLSTATUS),0) +ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) all: shared diff --git a/examples/l2fwd-keepalive/Makefile b/examples/l2fwd-keepalive/Makefile index 65d4a86b7..5c7eb85cd 100644 --- a/examples/l2fwd-keepalive/Makefile +++ b/examples/l2fwd-keepalive/Makefile @@ -9,6 +9,5 @@ SRCS-y := main.c shm.c # Build using pkg-config variables if possible -$(shell pkg-config --exists libdpdk) -ifeq ($(.SHELLSTATUS),0) +ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) all: shared diff --git a/examples/l2fwd/Makefile b/examples/l2fwd/Makefile index 43ac7f3c0..42b2234af 100644 --- a/examples/l2fwd/Makefile +++ b/examples/l2fwd/Makefile @@ -9,6 +9,5 @@ SRCS-y := main.c # Build using pkg-config variables if possible -$(shell pkg-config --exists libdpdk) -ifeq ($(.SHELLSTATUS),0) +ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) all: shared diff --git a/examples/l3fwd-acl/Makefile b/examples/l3fwd-acl/Makefile index 0ebf8cebd..8f01f7550 100644 --- a/examples/l3fwd-acl/Makefile +++ b/examples/l3fwd-acl/Makefile @@ -9,6 +9,5 @@ SRCS-y := main.c # Build using pkg-config variables if possible -$(shell pkg-config --exists libdpdk) -ifeq ($(.SHELLSTATUS),0) +ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) all: shared diff --git a/examples/l3fwd-power/Makefile b/examples/l3fwd-power/Makefile index 1d5f83acd..53aaaca48 100644 --- a/examples/l3fwd-power/Makefile +++ b/examples/l3fwd-power/Makefile @@ -9,6 +9,5 @@ SRCS-y := main.c perf_core.c # Build using pkg-config variables if possible -$(shell pkg-config --exists libdpdk) -ifeq ($(.SHELLSTATUS),0) +ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) all: shared diff --git a/examples/l3fwd-vf/Makefile b/examples/l3fwd-vf/Makefile index 5497f941c..c51117768 100644 --- a/examples/l3fwd-vf/Makefile +++ b/examples/l3fwd-vf/Makefile @@ -9,6 +9,5 @@ SRCS-y := main.c # Build using pkg-config variables if possible -$(shell pkg-config --exists libdpdk) -ifeq ($(.SHELLSTATUS),0) +ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) all: shared diff --git a/examples/l3fwd/Makefile b/examples/l3fwd/Makefile index 2ec75a545..4357ddb79 100644 --- a/examples/l3fwd/Makefile +++ b/examples/l3fwd/Makefile @@ -9,6 +9,5 @@ SRCS-y := main.c l3fwd_lpm.c l3fwd_em.c # Build using pkg-config variables if possible -$(shell pkg-config --exists libdpdk) -ifeq ($(.SHELLSTATUS),0) +ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) all: shared diff --git a/examples/link_status_interrupt/Makefile b/examples/link_status_interrupt/Makefile index b45338408..de11a17f0 100644 --- a/examples/link_status_interrupt/Makefile +++ b/examples/link_status_interrupt/Makefile @@ -9,6 +9,5 @@ SRCS-y := main.c # Build using pkg-config variables if possible -$(shell pkg-config --exists libdpdk) -ifeq ($(.SHELLSTATUS),0) +ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) all: shared diff --git a/examples/load_balancer/Makefile b/examples/load_balancer/Makefile index 437315871..9261ce4ef 100644 --- a/examples/load_balancer/Makefile +++ b/examples/load_balancer/Makefile @@ -9,6 +9,5 @@ SRCS-y := main.c config.c init.c runtime.c # Build using pkg-config variables if possible -$(shell pkg-config --exists libdpdk) -ifeq ($(.SHELLSTATUS),0) +ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) all: shared diff --git a/examples/packet_ordering/Makefile b/examples/packet_ordering/Makefile index 626665e4f..27b82b6ea 100644 --- a/examples/packet_ordering/Makefile +++ b/examples/packet_ordering/Makefile @@ -9,6 +9,5 @@ SRCS-y := main.c # Build using pkg-config variables if possible -$(shell pkg-config --exists libdpdk) -ifeq ($(.SHELLSTATUS),0) +ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) all: shared diff --git a/examples/ptpclient/Makefile b/examples/ptpclient/Makefile index 42db83f57..3eec3dc19 100644 --- a/examples/ptpclient/Makefile +++ b/examples/ptpclient/Makefile @@ -9,6 +9,5 @@ SRCS-y := ptpclient.c # Build using pkg-config variables if possible -$(shell pkg-config --exists libdpdk) -ifeq ($(.SHELLSTATUS),0) +ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) all: shared diff --git a/examples/qos_meter/Makefile b/examples/qos_meter/Makefile index b27baae6e..95bd1b148 100644 --- a/examples/qos_meter/Makefile +++ b/examples/qos_meter/Makefile @@ -9,6 +9,5 @@ SRCS-y := main.c rte_policer.c # Build using pkg-config variables if possible -$(shell pkg-config --exists libdpdk) -ifeq ($(.SHELLSTATUS),0) +ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) all: shared diff --git a/examples/qos_sched/Makefile b/examples/qos_sched/Makefile index c0a287e0c..2cdd5fa3d 100644 --- a/examples/qos_sched/Makefile +++ b/examples/qos_sched/Makefile @@ -9,6 +9,5 @@ SRCS-y := main.c args.c init.c app_thread.c cfg_file.c cmdline.c stats.c # Build using pkg-config variables if possible -$(shell pkg-config --exists libdpdk) -ifeq ($(.SHELLSTATUS),0) +ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) all: shared diff --git a/examples/rxtx_callbacks/Makefile b/examples/rxtx_callbacks/Makefile index 5b09eb279..2873f7995 100644 --- a/examples/rxtx_callbacks/Makefile +++ b/examples/rxtx_callbacks/Makefile @@ -9,6 +9,5 @@ SRCS-y := main.c # Build using pkg-config variables if possible -$(shell pkg-config --exists libdpdk) -ifeq ($(.SHELLSTATUS),0) +ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) all: shared diff --git a/examples/service_cores/Makefile b/examples/service_cores/Makefile index 030681fa4..49e2a5878 100644 --- a/examples/service_cores/Makefile +++ b/examples/service_cores/Makefile @@ -9,6 +9,5 @@ SRCS-y := main.c # Build using pkg-config variables if possible -$(shell pkg-config --exists libdpdk) -ifeq ($(.SHELLSTATUS),0) +ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) all: shared diff --git a/examples/skeleton/Makefile b/examples/skeleton/Makefile index d0fbacec7..f58c8903d 100644 --- a/examples/skeleton/Makefile +++ b/examples/skeleton/Makefile @@ -9,6 +9,5 @@ SRCS-y := basicfwd.c # Build using pkg-config variables if possible -$(shell pkg-config --exists libdpdk) -ifeq ($(.SHELLSTATUS),0) +ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) all: shared diff --git a/examples/tep_termination/Makefile b/examples/tep_termination/Makefile index 3025ef04d..5f76a97ef 100644 --- a/examples/tep_termination/Makefile +++ b/examples/tep_termination/Makefile @@ -9,6 +9,5 @@ SRCS-y := main.c vxlan_setup.c vxlan.c # Build using pkg-config variables if possible -$(shell pkg-config --exists libdpdk) -ifeq ($(.SHELLSTATUS),0) +ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) all: shared diff --git a/examples/timer/Makefile b/examples/timer/Makefile index 3698a8e38..3e8a14261 100644 --- a/examples/timer/Makefile +++ b/examples/timer/Makefile @@ -9,6 +9,5 @@ SRCS-y := main.c # Build using pkg-config variables if possible -$(shell pkg-config --exists libdpdk) -ifeq ($(.SHELLSTATUS),0) +ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) all: shared diff --git a/examples/vhost/Makefile b/examples/vhost/Makefile index b9cce0817..a8a8aba95 100644 --- a/examples/vhost/Makefile +++ b/examples/vhost/Makefile @@ -9,6 +9,5 @@ SRCS-y := main.c virtio_net.c # Build using pkg-config variables if possible -$(shell pkg-config --exists libdpdk) -ifeq ($(.SHELLSTATUS),0) +ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) all: shared diff --git a/examples/vhost_scsi/Makefile b/examples/vhost_scsi/Makefile index 43d54de9c..69e102de5 100644 --- a/examples/vhost_scsi/Makefile +++ b/examples/vhost_scsi/Makefile @@ -9,6 +9,5 @@ SRCS-y := scsi.c vhost_scsi.c # Build using pkg-config variables if possible -$(shell pkg-config --exists libdpdk) -ifeq ($(.SHELLSTATUS),0) +ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) all: shared diff --git a/examples/vmdq/Makefile b/examples/vmdq/Makefile index 63283a8e4..a9983a184 100644 --- a/examples/vmdq/Makefile +++ b/examples/vmdq/Makefile @@ -9,6 +9,5 @@ SRCS-y := main.c # Build using pkg-config variables if possible -$(shell pkg-config --exists libdpdk) -ifeq ($(.SHELLSTATUS),0) +ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) all: shared diff --git a/examples/vmdq_dcb/Makefile b/examples/vmdq_dcb/Makefile index c56954d12..5a8934c84 100644 --- a/examples/vmdq_dcb/Makefile +++ b/examples/vmdq_dcb/Makefile @@ -9,6 +9,5 @@ SRCS-y := main.c # Build using pkg-config variables if possible -$(shell pkg-config --exists libdpdk) -ifeq ($(.SHELLSTATUS),0) +ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) all: shared -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-08-22 19:38:22.853958269 +0100 +++ 0037-examples-fix-pkg-config-detection-with-older-make.patch 2019-08-22 19:38:20.467026164 +0100 @@ -1 +1 @@ -From 4131ad5db79a016970287282b938ebed2f19bdb3 Mon Sep 17 00:00:00 2001 +From d9760a99aeacd67c3400390119cc87b8bb98ce27 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 4131ad5db79a016970287282b938ebed2f19bdb3 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -51 +51,0 @@ - examples/vdpa/Makefile | 3 +-- @@ -53 +52,0 @@ - examples/vhost_crypto/Makefile | 3 +-- @@ -57 +56 @@ - 42 files changed, 42 insertions(+), 84 deletions(-) + 40 files changed, 40 insertions(+), 80 deletions(-) @@ -60 +59 @@ -index 2bf97e415..715c521a9 100644 +index c149589bc..378b4cb54 100644 @@ -72 +71 @@ -index 96868f2fc..0229b31bb 100644 +index 2511b71eb..665fcf6a3 100644 @@ -84 +83 @@ -index 9b757316f..c1852080a 100644 +index d4180406e..fbe521c39 100644 @@ -96 +95 @@ -index 6aa5e7a9e..bac8d5578 100644 +index 02656e326..372446f9c 100644 @@ -108 +107 @@ -index 626d56024..205145853 100644 +index 12e3f262b..cab4d4050 100644 @@ -120 +119 @@ -index dc891b3d1..90c7f133a 100644 +index 6f52213ed..013ae1cbe 100644 @@ -132 +131 @@ -index f8cbba592..9485daf7a 100644 +index 2e30ab266..5fb64e4d9 100644 @@ -135 +134 @@ -@@ -18,6 +18,5 @@ SRCS-y += main.c +@@ -16,6 +16,5 @@ SRCS-y += main.c @@ -144 +143 @@ -index aca7772b4..4c23e5c6d 100644 +index 08bf71272..5c0f7fc57 100644 @@ -156 +155 @@ -index a64a10a08..a63a75555 100644 +index 619ed53b7..5140f5079 100644 @@ -168 +167 @@ -index 2ab294091..403afa050 100644 +index 9cf7c4e7c..970c9ea80 100644 @@ -180 +179 @@ -index 63b66ce25..6af25a02e 100644 +index de9281677..84e66f239 100644 @@ -192 +191 @@ -index 1553d705d..cf10d7180 100644 +index 1e03befeb..d667af811 100644 @@ -204 +203 @@ -index 5af5d63bd..0b1a904e0 100644 +index 8b2a158af..ad7e5feae 100644 @@ -216 +215 @@ -index 1bfaf3b9a..851123be5 100644 +index 9e19c2519..3fd2079df 100644 @@ -219 +218 @@ -@@ -20,6 +20,5 @@ CFLAGS += -gdwarf-2 +@@ -19,6 +19,5 @@ CFLAGS += -gdwarf-2 @@ -228 +227 @@ -index a03bfadbf..5f8a67dd4 100644 +index f840f1642..83a21feba 100644 @@ -240 +239 @@ -index 46f592692..5dc8118e3 100644 +index 3b9bacb7c..6c3e30396 100644 @@ -252 +251 @@ -index e83d406b0..c1960d6d3 100644 +index b80f73014..3c39ed6db 100644 @@ -264 +263 @@ -index 87d311193..29fd530b4 100644 +index 5c2fd3c05..21fd8eeae 100644 @@ -276 +275 @@ -index d63ece8e3..729a39e93 100644 +index 7fb0a2618..aec35390e 100644 @@ -288 +287 @@ -index 9b92bc238..37de27a6f 100644 +index 65d4a86b7..5c7eb85cd 100644 @@ -300 +299 @@ -index fb352e1b7..230352093 100644 +index 43ac7f3c0..42b2234af 100644 @@ -312 +311 @@ -index d12d3a987..e2c989f71 100644 +index 0ebf8cebd..8f01f7550 100644 @@ -324 +323 @@ -index 359f323dc..98248f462 100644 +index 1d5f83acd..53aaaca48 100644 @@ -336 +335 @@ -index 892ecf38b..7b186a23c 100644 +index 5497f941c..c51117768 100644 @@ -348 +347 @@ -index 52976880a..c55f5c288 100644 +index 2ec75a545..4357ddb79 100644 @@ -360 +359 @@ -index 77774eda7..97e5a14a8 100644 +index b45338408..de11a17f0 100644 @@ -372 +371 @@ -index 09676a57c..caae8a107 100644 +index 437315871..9261ce4ef 100644 @@ -384 +383 @@ -index eb01b2d5b..51acaf7eb 100644 +index 626665e4f..27b82b6ea 100644 @@ -396 +395 @@ -index 019476a7a..89e2bacbd 100644 +index 42db83f57..3eec3dc19 100644 @@ -408 +407 @@ -index e4d170177..e5217cf7c 100644 +index b27baae6e..95bd1b148 100644 @@ -420 +419 @@ -index 0c92c4866..ce2d25371 100644 +index c0a287e0c..2cdd5fa3d 100644 @@ -432 +431 @@ -index 2ababd2e4..edd5b52cd 100644 +index 5b09eb279..2873f7995 100644 @@ -444 +443 @@ -index ae7d6478c..abbb7aed2 100644 +index 030681fa4..49e2a5878 100644 @@ -456 +455 @@ -index 68454a558..c5ac26029 100644 +index d0fbacec7..f58c8903d 100644 @@ -468 +467 @@ -index be5aa9a64..31165bd92 100644 +index 3025ef04d..5f76a97ef 100644 @@ -480 +479 @@ -index d21e4c63c..a86178355 100644 +index 3698a8e38..3e8a14261 100644 @@ -491,12 +489,0 @@ -diff --git a/examples/vdpa/Makefile b/examples/vdpa/Makefile -index 734042380..2ac991a4b 100644 ---- a/examples/vdpa/Makefile -+++ b/examples/vdpa/Makefile -@@ -10,6 +10,5 @@ CFLAGS += -DALLOW_EXPERIMENTAL_API - - # Build using pkg-config variables if possible --$(shell pkg-config --exists libdpdk) --ifeq ($(.SHELLSTATUS),0) -+ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) - - all: shared @@ -504 +491 @@ -index 5e1400678..f84b7f017 100644 +index b9cce0817..a8a8aba95 100644 @@ -515,12 +501,0 @@ -diff --git a/examples/vhost_crypto/Makefile b/examples/vhost_crypto/Makefile -index e7958b5ba..a9e1c4d3a 100644 ---- a/examples/vhost_crypto/Makefile -+++ b/examples/vhost_crypto/Makefile -@@ -10,6 +10,5 @@ CFLAGS += -DALLOW_EXPERIMENTAL_API - - # Build using pkg-config variables if possible --$(shell pkg-config --exists libdpdk) --ifeq ($(.SHELLSTATUS),0) -+ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) - - all: shared @@ -528 +503 @@ -index 3ea37ebc6..c5aec269e 100644 +index 43d54de9c..69e102de5 100644 @@ -540 +515 @@ -index dc1bc82d0..1557ee86b 100644 +index 63283a8e4..a9983a184 100644 @@ -552 +527 @@ -index a77e78987..391096cfb 100644 +index c56954d12..5a8934c84 100644