From 1fc4165fe9bf8512483356ad8e6d27f793f2e3db Mon Sep 17 00:00:00 2001 From: paul luse Date: Thu, 21 Feb 2019 13:57:24 -0500 Subject: [PATCH] bdev/crypto: add /include symlink for ISAL Currently we only include the dir just above ISA-L which allows the isal.h file includes to be found however DPDK can't find isa-l.h at that location because its one level deeper. By adding a symlink in the isa-l subdir we can redirect DPDK to find the isa-l header files. Change-Id: Ieeabd4273bade0241db5581764b2169103f9770f Signed-off-by: paul luse Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/445767 Tested-by: SPDK CI Jenkins Reviewed-by: Jim Harris Reviewed-by: Shuhei Matsumoto Reviewed-by: Ben Walker --- dpdkbuild/Makefile | 2 +- isalbuild/Makefile | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dpdkbuild/Makefile b/dpdkbuild/Makefile index 8dddb8074..8749bddfe 100644 --- a/dpdkbuild/Makefile +++ b/dpdkbuild/Makefile @@ -66,7 +66,7 @@ endif ifeq ($(CONFIG_REDUCE),y) DPDK_OPTS += CONFIG_RTE_LIBRTE_PMD_ISAL=y -DPDK_CFLAGS += -I$(ISAL_DIR)/.. +DPDK_CFLAGS += -I$(ISAL_DIR) else DPDK_OPTS += CONFIG_RTE_LIBRTE_PMD_ISAL=n endif diff --git a/isalbuild/Makefile b/isalbuild/Makefile index 3fc8171bb..e5a757151 100644 --- a/isalbuild/Makefile +++ b/isalbuild/Makefile @@ -40,10 +40,14 @@ ifneq ($(Q),) REDIRECT=> /dev/null endif -all: +$(ISAL_DIR)/isa-l: + @ln -s $(ISAL_DIR)/include $(ISAL_DIR)/isa-l + +all: $(ISAL_DIR)/isa-l $(Q)$(MAKE) -C $(SPDK_ROOT_DIR)/isa-l -j$(NPROC) all CC=cc $(REDIRECT) install: all clean: $(Q)$(MAKE) -C $(SPDK_ROOT_DIR)/isa-l clean $(REDIRECT) + $(Q)rm -f $(ISAL_DIR)/isa-l