From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id EDD06A0561;
Fri, 28 Feb 2020 14:25:56 +0100 (CET)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id A1FBE1BFDD;
Fri, 28 Feb 2020 14:25:55 +0100 (CET)
Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com
[66.111.4.25]) by dpdk.org (Postfix) with ESMTP id 0CC311BFD3;
Fri, 28 Feb 2020 14:25:54 +0100 (CET)
Received: from compute7.internal (compute7.nyi.internal [10.202.2.47])
by mailout.nyi.internal (Postfix) with ESMTP id 89CA9220A9;
Fri, 28 Feb 2020 08:25:53 -0500 (EST)
Received: from mailfrontend1 ([10.202.2.162])
by compute7.internal (MEProxy); Fri, 28 Feb 2020 08:25:53 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h=
from:to:cc:subject:date:message-id:in-reply-to:references
:mime-version:content-transfer-encoding; s=mesmtp; bh=cFwifp9mRV
9JNP8+M47yu7CRFB1ibARQS13vTUfsEeo=; b=cQLDwWQsDExnYrYbrI/39c0CA8
D/zCApXRDDl4t9CAeBAbC0hMN2HiUMwjYKppkcSFbWe/avERSdPXWxxl7omzJ8cO
RE7K0awC2mY3f+wvOkeb4v5YCBdgF8kEC/d5zNzP1QZJEwhY7l9MIBHq7reBqZMU
MRz/Yd26xsKRQgrqg=
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=
messagingengine.com; h=cc:content-transfer-encoding:date:from
:in-reply-to:message-id:mime-version:references:subject:to
:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=
fm2; bh=cFwifp9mRV9JNP8+M47yu7CRFB1ibARQS13vTUfsEeo=; b=RNzGmZmZ
NyLqHN8IQrzTJK/ulBFSjBa28WbnSvCc234PCKm4jzHFImoXHL/ijPiHzIwpBQTp
jqFw73FNmzoBUtNNygOL8/ZwGvpsBMk62RkPYJO7n0Ny6bJ+aooLYwff9XoN/uo1
ZkFBk0NcxB2NKaPfPB5YPGdVV+qANkkeVbF6G6HWVvbFs7ln62f3XwKVId9bLbjm
urG8LGSlXp+oYL8z46EgK4WBgAfE1Sg9LpCOgbTUPxEbV1R1CORu4FYCV0xo4abd
kw+2fDwSOmLut6PtZ8qnYwLRGbjwd28DVxUiHEqXB8A5fyl19s1gae/sXbIiOU3t
k0M6tO+uTYYPNA==
X-ME-Sender: <xms:4BRZXqx2YWabWUpOuCcKtkj-vpKFUwDmW5r9wJh_hvN8Q5tVShaY6Q>
X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedugedrleekgdehtdcutefuodetggdotefrodftvf
curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu
uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc
fjughrpefhvffufffkofgjfhgggfestdekredtredttdenucfhrhhomhepvfhhohhmrghs
ucfoohhnjhgrlhhonhcuoehthhhomhgrshesmhhonhhjrghlohhnrdhnvghtqeenucffoh
hmrghinhepghhnuhdrohhrghenucfkphepleefrdeirddugeelrdduudegnecuvehluhhs
thgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepthhhohhmrghssehmoh
hnjhgrlhhonhdrnhgvth
X-ME-Proxy: <xmx:4BRZXsYT3VH9W4zhtkkqa1UqHosnn_x7i-ddItm3qB0pwzH5EUdDbA>
<xmx:4BRZXh73KBSNsSCl0RLqzDIGSOVmeGuFsF0sB8Ze15XoozBQXFD3WQ>
<xmx:4BRZXj7JQ33Ogg-ZKl7hCMztfNLr8RKEeO2tn7azpBADv2koXab4ag>
<xmx:4RRZXlfw2Fh-AGhY-paYr5dcr5VLK_u29wMm8WyTocQ0VE1tnqgtGw>
Received: from xps.monjalon.net (114.149.6.93.rev.sfr.net [93.6.149.114])
by mail.messagingengine.com (Postfix) with ESMTPA id 689EE3280065;
Fri, 28 Feb 2020 08:25:51 -0500 (EST)
From: Thomas Monjalon <thomas@monjalon.net>
To: dev@dpdk.org
Cc: roy.fan.zhang@intel.com, pablo.de.lara.guarch@intel.com,
bruce.richardson@intel.com, stable@dpdk.org,
Declan Doherty <declan.doherty@intel.com>,
Luca Boccassi <bluca@debian.org>, Akhil Goyal <akhil.goyal@nxp.com>
Date: Fri, 28 Feb 2020 14:25:47 +0100
Message-Id: <20200228132547.650594-1-thomas@monjalon.net>
X-Mailer: git-send-email 2.25.1
In-Reply-To: <20200227223326.507857-1-thomas@monjalon.net>
References: <20200227223326.507857-1-thomas@monjalon.net>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [dpdk-dev] [PATCH v2] drivers/crypto: fix build with make 4.3
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>,
<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>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
In the check for the version of intel-ipsec-mb library,
there is a backslash in front of the #include.
This backslash is for escaping the hash sign parsed as
a number sign in make.
Since make-4.3, escaping is not required for the number sign.
As a consequence, it resolves now to '\#':
syntax error near unexpected token `|'
`grep -e "IMB_VERSION_STR" \#include <intel-ipsec-mb.h> | cut -d'"' -f2'
syntax error near unexpected token `|'
`grep -e "IMB_VERSION_NUM" \#include <intel-ipsec-mb.h> | cut -d' ' -f3'
The makefiles are fixed by using a variable for the hash sign,
as recommended in make-4.3 changelog:
https://lists.gnu.org/archive/html/info-gnu/2020-01/msg00004.html
Fixes: 3067c8ce77ac ("crypto/aesni_mb: fix build with custom dependency path")
Fixes: 457b8e372975 ("crypto/aesni_gcm: check dependency version with make")
Fixes: bf6eb2c22fd1 ("crypto/kasumi: use IPsec library")
Fixes: 7c87e2d7b359 ("crypto/snow3g: use IPsec library")
Fixes: 61f7c988e39e ("crypto/zuc: use IPsec library")
Cc: stable@dpdk.org
Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
---
v2:
- found the root cause in make-4.3
- use $H for compatibility with make < 4.3
Note the list of "Fixes" references are here to help backporting,
even if there was no bug before the recent release of make-4.3.
---
drivers/crypto/aesni_gcm/Makefile | 3 ++-
drivers/crypto/aesni_mb/Makefile | 3 ++-
drivers/crypto/kasumi/Makefile | 3 ++-
drivers/crypto/snow3g/Makefile | 3 ++-
drivers/crypto/zuc/Makefile | 3 ++-
5 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/drivers/crypto/aesni_gcm/Makefile b/drivers/crypto/aesni_gcm/Makefile
index d8190a2ff4..b443167d51 100644
--- a/drivers/crypto/aesni_gcm/Makefile
+++ b/drivers/crypto/aesni_gcm/Makefile
@@ -20,7 +20,8 @@ LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
LDLIBS += -lrte_cryptodev
LDLIBS += -lrte_bus_vdev
-IMB_HDR = $(shell echo '\#include <intel-ipsec-mb.h>' | \
+H := \#
+IMB_HDR = $(shell echo '$Hinclude <intel-ipsec-mb.h>' | \
$(CC) -E $(EXTRA_CFLAGS) - | grep 'intel-ipsec-mb.h' | \
head -n1 | cut -d'"' -f2)
diff --git a/drivers/crypto/aesni_mb/Makefile b/drivers/crypto/aesni_mb/Makefile
index f1530e74c4..aa2e428106 100644
--- a/drivers/crypto/aesni_mb/Makefile
+++ b/drivers/crypto/aesni_mb/Makefile
@@ -20,7 +20,8 @@ LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
LDLIBS += -lrte_cryptodev
LDLIBS += -lrte_bus_vdev
-IMB_HDR = $(shell echo '\#include <intel-ipsec-mb.h>' | \
+H := \#
+IMB_HDR = $(shell echo '$Hinclude <intel-ipsec-mb.h>' | \
$(CC) -E $(EXTRA_CFLAGS) - | grep 'intel-ipsec-mb.h' | \
head -n1 | cut -d'"' -f2)
diff --git a/drivers/crypto/kasumi/Makefile b/drivers/crypto/kasumi/Makefile
index c94d6bdcf9..ad19aad11c 100644
--- a/drivers/crypto/kasumi/Makefile
+++ b/drivers/crypto/kasumi/Makefile
@@ -20,7 +20,8 @@ LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
LDLIBS += -lrte_cryptodev
LDLIBS += -lrte_bus_vdev
-IMB_HDR = $(shell echo '\#include <intel-ipsec-mb.h>' | \
+H := \#
+IMB_HDR = $(shell echo '$Hinclude <intel-ipsec-mb.h>' | \
$(CC) -E $(EXTRA_CFLAGS) - | grep 'intel-ipsec-mb.h' | \
head -n1 | cut -d'"' -f2)
diff --git a/drivers/crypto/snow3g/Makefile b/drivers/crypto/snow3g/Makefile
index 438119c3d5..cbf1a77904 100644
--- a/drivers/crypto/snow3g/Makefile
+++ b/drivers/crypto/snow3g/Makefile
@@ -20,7 +20,8 @@ LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
LDLIBS += -lrte_cryptodev
LDLIBS += -lrte_bus_vdev
-IMB_HDR = $(shell echo '\#include <intel-ipsec-mb.h>' | \
+H := \#
+IMB_HDR = $(shell echo '$Hinclude <intel-ipsec-mb.h>' | \
$(CC) -E $(EXTRA_CFLAGS) - | grep 'intel-ipsec-mb.h' | \
head -n1 | cut -d'"' -f2)
diff --git a/drivers/crypto/zuc/Makefile b/drivers/crypto/zuc/Makefile
index b50883b2a7..1875344472 100644
--- a/drivers/crypto/zuc/Makefile
+++ b/drivers/crypto/zuc/Makefile
@@ -20,7 +20,8 @@ LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
LDLIBS += -lrte_cryptodev
LDLIBS += -lrte_bus_vdev
-IMB_HDR = $(shell echo '\#include <intel-ipsec-mb.h>' | \
+H := \#
+IMB_HDR = $(shell echo '$Hinclude <intel-ipsec-mb.h>' | \
$(CC) -E $(EXTRA_CFLAGS) - | grep 'intel-ipsec-mb.h' | \
head -n1 | cut -d'"' -f2)
--
2.25.1