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 1D9FDA0093 for ; Tue, 19 May 2020 14:58:42 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1107E1D60D; Tue, 19 May 2020 14:58:42 +0200 (CEST) Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by dpdk.org (Postfix) with ESMTP id 0B7261D5DE for ; Tue, 19 May 2020 14:58:40 +0200 (CEST) Received: by mail-wm1-f68.google.com with SMTP id g14so2395364wme.1 for ; Tue, 19 May 2020 05:58:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3OcSmQya7UGw/CpYRCWS9rhWOHKaBoD+7eF+ayCOxEE=; b=QxXE+SNZRxFjFgNE8e5OR5Y4ULRT/nLoaqSoIpouX9qV/JUMgWgLwxmFql3a5m+4k6 UfxZ7q7ZOs2PICS1+PYOTtY73I7//92pz/3+N6HzPYVv/1uX0+s8f6jdXFWUDwZUZkoW BnKMCxZ3jBcEw+C9KVACrC+ZngG62f6oFmaKl2/ZC3jZUBIYQzorxPt6nQ53oZuFEF4u 1P93X4qR2iYKKWGruyO3rOS9att5XeZWmtpFaVFmLxgj6Rbj5p74DVtH8pHBsAmu++wL tJQBKc5PQWrXju/JgmmUdFWM9GRME8vaYQoj0Fmago8t8Z5d5ocFc0WM275q53xBgpfv lBPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3OcSmQya7UGw/CpYRCWS9rhWOHKaBoD+7eF+ayCOxEE=; b=eEzsOaJfY/VTyyXcG6s2VzRtbhmnZN+bdtNtzSHA8dfRqzVENA3qDL0xrthmIlinp0 za434fUf8D0dbJFhVyAnwPxSVLThEb3aNt4KOXcy/k/WMUNtlLPe1c9iOL/8KRv073Hw Y+l84NbAdItsd7vnpSnFrCyN/8wHdxrxZxf6QYAbCOAYBd3VX6qI8Gs6PowgxndmpUAV kPgLWEnsjuUQedUAW4C3JlhQL3cTHoepnLlo6nQ651VFXzSMl0TVfNcN7R0wBVkH1rC3 T5LAfHCZdicFzrGDoKhCbrA1XKMGnULPWxaI6c0FST0RzfEX8uTfdIAmzT/BREo0jB0W GT2w== X-Gm-Message-State: AOAM531PuV6MhOVqsT9h2q+/I16j6p/q/zYL7talawXPDps4XaJs8+s0 4WZZGwtBvtLO8b1Lbu/3bhFaaOgVrPjb1w== X-Google-Smtp-Source: ABdhPJzZ420l6+ZInkItJkDqvnRSQlc1xq8X3+cY23aIp7fKJuub1/NCe0UADHSivKlBQL0OqAQ5dA== X-Received: by 2002:a1c:545e:: with SMTP id p30mr5292079wmi.20.1589893119729; Tue, 19 May 2020 05:58:39 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id t6sm3930726wma.4.2020.05.19.05.58.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 05:58:39 -0700 (PDT) From: luca.boccassi@gmail.com To: Thomas Monjalon Cc: dpdk stable Date: Tue, 19 May 2020 13:53:18 +0100 Message-Id: <20200519125804.104349-8-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519125804.104349-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'drivers/crypto: fix build with make 4.3' has been queued to stable release 19.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 stable release 19.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 05/21/20. 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. Thanks. Luca Boccassi --- >From 2a46dc595163dc3f12de1bea60b88432eeb006fe Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Thu, 27 Feb 2020 23:20:28 +0100 Subject: [PATCH] drivers/crypto: fix build with make 4.3 [ upstream commit 2a860943b847fbd44e08ef4f1ca66de759875c9e ] 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 | cut -d'"' -f2' syntax error near unexpected token `|' `grep -e "IMB_VERSION_NUM" \#include | 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") Signed-off-by: Thomas Monjalon --- drivers/crypto/aesni_gcm/Makefile | 3 ++- drivers/crypto/aesni_mb/Makefile | 3 ++- 2 files changed, 4 insertions(+), 2 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 ' | \ +H := \# +IMB_HDR = $(shell echo '$Hinclude ' | \ $(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 ' | \ +H := \# +IMB_HDR = $(shell echo '$Hinclude ' | \ $(CC) -E $(EXTRA_CFLAGS) - | grep 'intel-ipsec-mb.h' | \ head -n1 | cut -d'"' -f2) -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 13:56:19.163682163 +0100 +++ 0008-drivers-crypto-fix-build-with-make-4.3.patch 2020-05-19 13:56:18.171500955 +0100 @@ -1,8 +1,10 @@ -From 2a860943b847fbd44e08ef4f1ca66de759875c9e Mon Sep 17 00:00:00 2001 +From 2a46dc595163dc3f12de1bea60b88432eeb006fe Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Thu, 27 Feb 2020 23:20:28 +0100 Subject: [PATCH] drivers/crypto: fix build with make 4.3 +[ upstream commit 2a860943b847fbd44e08ef4f1ca66de759875c9e ] + 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 @@ -25,16 +27,12 @@ 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 --- 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(-) + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/crypto/aesni_gcm/Makefile b/drivers/crypto/aesni_gcm/Makefile index d8190a2ff4..b443167d51 100644 @@ -57,48 +55,6 @@ @@ -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 ' | \ -+H := \# -+IMB_HDR = $(shell echo '$Hinclude ' | \ - $(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 ' | \ -+H := \# -+IMB_HDR = $(shell echo '$Hinclude ' | \ - $(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 ' | \ -+H := \# -+IMB_HDR = $(shell echo '$Hinclude ' | \ - $(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 ' | \ +H := \#