Commit fdf5c1d7 authored by Daniel Verkamp's avatar Daniel Verkamp
Browse files

build: add -lcrypto (OpenSSL) to SYS_LIBS 



This is already required to build the shared library and iSCSI
components; simplify these Makefiles by adding -lcrypto to the central
SYS_LIBS in mk/spdk.common.mk.

Change-Id: I8fdaffbccc1294e24e32559387b0ed99d1deb0ce
Signed-off-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Reviewed-on: https://review.gerrithub.io/415351


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent 65c48bfb

app/iscsi_tgt/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ endif 
LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \

	$(COPY_MODULES_LINKER_ARGS) \

	$(NET_MODULES_LINKER_ARGS)

LIBS += $(SPDK_LIB_LINKER_ARGS) -lcrypto

LIBS += $(SPDK_LIB_LINKER_ARGS)

LIBS += $(ENV_LINKER_ARGS)



all : $(APP)

app/spdk_tgt/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \ 
	$(COPY_MODULES_LINKER_ARGS) \

	$(NET_MODULES_LINKER_ARGS) \

	$(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS)

LIBS += -lcrypto



all: $(APP)

	@:

mk/spdk.common.mk

+1 −0
Original line number Diff line number Diff line
@@ -192,6 +192,7 @@ CXXFLAGS += $(COMMON_CFLAGS) -std=c++0x 


SYS_LIBS += -lrt

SYS_LIBS += -luuid

SYS_LIBS += -lcrypto



MAKEFLAGS += --no-print-directory

shared_lib/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -91,7 +91,6 @@ $(SHARED_LIB): $(SPDK_LIB_FILES) $(SPDK_WHOLE_LIBS) $(BLOCKDEV_MODULES_FILES) $( 
		$(filter-out -Wl$(comma)--no-whole-archive,$(LIBS)) \

		-Wl,--no-whole-archive \

		-Wl,--version-script=spdk.map \

		-lcrypto \

		$(SYS_LIBS)



.PHONY: all clean $(DIRS-y)

test/unit/lib/iscsi/iscsi.c/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ SCSI_OBJS = port 
ISCSI_OBJS = md5 param

LIBS += $(SCSI_OBJS:%=$(SPDK_ROOT_DIR)/lib/scsi/%.o)

LIBS += $(ISCSI_OBJS:%=$(SPDK_ROOT_DIR)/lib/iscsi/%.o)

LIBS += -lcunit -lcrypto $(ENV_LINKER_ARGS)

LIBS += -lcunit $(ENV_LINKER_ARGS)



TEST_FILE = iscsi_ut.c