From c3d50699470259aa86257af568e87d04f2b7c096 Mon Sep 17 00:00:00 2001 From: Michal Berger Date: Tue, 5 Jan 2021 14:58:53 +0100 Subject: [PATCH] pkgdep/git: Fix spdk_abi_lts build for v20.01 under make 4.3 This attempts to mimic commit 2a860943b8 from DPDK repo to pass the build under make 4.3. Currently, this affects Fedora33 which ships with make 4.3 by default. Change-Id: If3afa8ad9200d618f43bbea42360efbfe99d3085 Signed-off-by: Michal Berger Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/5779 Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins Reviewed-by: Karol Latecki Reviewed-by: Jim Harris Reviewed-by: Tomasz Zawadzki --- test/common/config/pkgdep/git | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/test/common/config/pkgdep/git b/test/common/config/pkgdep/git index 4f12b48f1..624c62bde 100644 --- a/test/common/config/pkgdep/git +++ b/test/common/config/pkgdep/git @@ -51,6 +51,21 @@ function install_refspdk() { git -C "$output_dir" checkout "$release" git -C "$output_dir" submodule update --init + if [[ "$release" == v20.01* ]]; then + makefiles=( + "$output_dir/dpdk/drivers/crypto/aesni_gcm/Makefile" + "$output_dir/dpdk/drivers/crypto/aesni_mb/Makefile" + "$output_dir/dpdk/drivers/crypto/kasumi/Makefile" + "$output_dir/dpdk/drivers/crypto/snow3g/Makefile" + ) + # Attempt to replicate dpdk's 2a860943b8 commit which fixes builds under make 4.3 + # FIXME: Remove this when LTS changes! + for makefile in "${makefiles[@]}"; do + # This sed call is meant to be compatible with its FreeBSD implementation + echo "$(sed -e 's/\\#/\$H/g' -e '/IMB_HDR =/i\ + H := \\#' "$makefile")" > "$makefile" + done + fi cat > $HOME/autorun-spdk.conf <<- EOF SPDK_BUILD_SHARED_OBJECT=1 SPDK_TEST_AUTOBUILD=1