d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

drivers/crypto: fix build with make 4.3

Browse Source 
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: 3067c8ce77 ("crypto/aesni_mb: fix build with custom dependency path")
Fixes: 457b8e3729 ("crypto/aesni_gcm: check dependency version with make")
Fixes: bf6eb2c22f ("crypto/kasumi: use IPsec library")
Fixes: 7c87e2d7b3 ("crypto/snow3g: use IPsec library")
Fixes: 61f7c988e3 ("crypto/zuc: use IPsec library")
Cc: stable@dpdk.org

Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
This commit is contained in:
Thomas Monjalon 2020-02-27 23:20:28 +01:00
parent 44c775feb4
commit 2a860943b8
5 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/crypto/aesni_gcm/Makefile
View File

@ -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)

3
drivers/crypto/aesni_mb/Makefile
View File

@ -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)

3
drivers/crypto/kasumi/Makefile
View File

@ -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)

3
drivers/crypto/snow3g/Makefile
View File

@ -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)

3
drivers/crypto/zuc/Makefile
View File

@ -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)