Commit 83ef4d2b authored by Ben Walker's avatar Ben Walker Committed by Tomasz Zawadzki
Browse files

isal: If the user builds with shared libraries, use ISA-L shared 


libraries

Signed-off-by: default avatarBen Walker <ben@nvidia.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/21490

 (master)

(cherry picked from commit 6c6c42fc)
Change-Id: I6e5882a2d0347971e99bbed26a2291cb3361800b
Signed-off-by: default avatarMarek Chomnicki <marek.chomnicki@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/21611


Bypass-Merge-Requirements: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
parent 66fc9c43

configure

+10 −2
Original line number Diff line number Diff line
@@ -1219,7 +1219,11 @@ if [[ "${CONFIG[ISAL]}" = "y" ]]; then 
	else

		ISAL_OPTS=()

	fi

	ISAL_CRYPTO_OPTS+=("--enable-shared=no")

	if [[ -n "${CONFIG[SHARED]}" ]]; then

		ISAL_OPTS+=("--enable-shared=yes")

	else

		ISAL_OPTS+=("--enable-shared=no")

	fi

	ISAL_OPTS+=("--prefix=${CONFIG[PREFIX]}")

	echo -n "Configuring ISA-L (logfile: $ISAL_LOG)..."

	./autogen.sh &> $ISAL_LOG
@@ -1248,7 +1252,11 @@ if [[ "${CONFIG[ISAL]}" = "y" ]]; then 
	if [[ -n "${CONFIG[CROSS_PREFIX]}" ]]; then

		ISAL_CRYPTO_OPTS+=("--host=${CONFIG[CROSS_PREFIX]}")

	fi

	if [[ -n "${CONFIG[SHARED]}" ]]; then

		ISAL_CRYPTO_OPTS+=("--enable-shared=yes")

	else

		ISAL_CRYPTO_OPTS+=("--enable-shared=no")

	fi

	ISAL_CRYPTO_OPTS+=("--prefix=${CONFIG[PREFIX]}")

	echo -n "Configuring ISA-L-crypto (logfile: $ISAL_CRYPTO_LOG)..."

	./autogen.sh &> $ISAL_CRYPTO_LOG

lib/accel/Makefile

+0 −10
Original line number Diff line number Diff line
@@ -14,16 +14,6 @@ SO_SUFFIX := $(SO_VER).$(SO_MINOR) 
LIBNAME = accel

C_SRCS = accel.c accel_rpc.c accel_sw.c



LOCAL_SYS_LIBS =



ifeq ($(CONFIG_ISAL), y)

LOCAL_SYS_LIBS += -L$(ISAL_DIR)/.libs -lisal

endif



ifeq ($(CONFIG_ISAL_CRYPTO), y)

LOCAL_SYS_LIBS += -L$(ISAL_CRYPTO_DIR)/.libs -lisal_crypto

endif



SPDK_MAP_FILE = $(abspath $(CURDIR)/spdk_accel.map)



include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk

lib/util/Makefile

+0 −4
Original line number Diff line number Diff line
@@ -18,10 +18,6 @@ ifneq ($(OS),FreeBSD) 
LOCAL_SYS_LIBS = -luuid

endif



ifeq ($(CONFIG_ISAL), y)

LOCAL_SYS_LIBS += -L$(ISAL_DIR)/.libs -lisal

endif



ifeq ($(CONFIG_HAVE_UUID_GENERATE_SHA1), n)

LOCAL_SYS_LIBS += -lssl

endif

mk/spdk.common.mk

+12 −2
Original line number Diff line number Diff line
@@ -179,11 +179,21 @@ IPSEC_MB_DIR=$(CONFIG_IPSEC_MB_DIR) 
ISAL_DIR=$(SPDK_ROOT_DIR)/isa-l

ISAL_CRYPTO_DIR=$(SPDK_ROOT_DIR)/isa-l-crypto

ifeq ($(CONFIG_ISAL), y)

SYS_LIBS += -L$(ISAL_DIR)/.libs -lisal

COMMON_CFLAGS += -I$(ISAL_DIR)/..

ifeq ($(CONFIG_SHARED),y)

SYS_LIBS += -L$(ISAL_DIR)/.libs -lisal

LDFLAGS += -Wl,-rpath=$(ISAL_DIR)/.libs

else

SYS_LIBS += $(ISAL_DIR)/.libs/libisal.a

endif

ifeq ($(CONFIG_ISAL_CRYPTO), y)

SYS_LIBS += -L$(ISAL_CRYPTO_DIR)/.libs -lisal_crypto

COMMON_CFLAGS += -I$(ISAL_CRYPTO_DIR)/..

ifeq ($(CONFIG_SHARED),y)

SYS_LIBS += -L$(ISAL_CRYPTO_DIR)/.libs -lisal_crypto

LDFLAGS += -Wl,-rpath=$(ISAL_CRYPTO_DIR)/.libs

else

SYS_LIBS += $(ISAL_CRYPTO_DIR)/.libs/libisal_crypto.a

endif

endif

endif

test/external_code/Makefile

+10 −0
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ rootdir = $(shell dirname $(shell realpath $(word 1,$(MAKEFILE_LIST))))/../.. 
SPDK_HEADER_DIR	?= $(rootdir)/include

SPDK_LIB_DIR	?= $(rootdir)/build/lib

DPDK_LIB_DIR	?= $(rootdir)/dpdk/build/lib

ISAL_LIB_DIR	?= $(rootdir)/isa-l/.libs

ISAL_CRYPTO_LIB_DIR ?= $(rootdir)/isa-l-crypto/.libs

VFIO_LIB_DIR	?= $(rootdir)/build/libvfio-user/usr/local/lib



ifneq ($(SPDK_HEADER_DIR),)
@@ -22,6 +24,14 @@ ifneq ($(DPDK_LIB_DIR),) 
COMMON_CFLAGS+=-L$(DPDK_LIB_DIR)

endif



ifneq ($(ISAL_LIB_DIR),)

COMMON_CFLAGS+=-L$(ISAL_LIB_DIR)

endif



ifneq ($(ISAL_CRYPTO_LIB_DIR),)

COMMON_CFLAGS+=-L$(ISAL_CRYPTO_LIB_DIR)

endif



ifneq ($(VFIO_LIB_DIR),)

COMMON_CFLAGS+=-L$(VFIO_LIB_DIR)

endif