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: Daniel Verkamp <[email protected]> Reviewed-on: https://review.gerrithub.io/415351 Tested-by: SPDK Automated Test System <[email protected]> Reviewed-by: Jim Harris <[email protected]> Reviewed-by: Ben Walker <[email protected]>
justapig9020 · Jun 20, 2018 · fdf5c1d · fdf5c1d
1 parent 65c48bf
commit fdf5c1d
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 4 deletions.
diff --git a/app/iscsi_tgt/Makefile b/app/iscsi_tgt/Makefile
@@ -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)

diff --git a/app/spdk_tgt/Makefile b/app/spdk_tgt/Makefile
@@ -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)
 	@:

diff --git a/mk/spdk.common.mk b/mk/spdk.common.mk
@@ -192,6 +192,7 @@ CXXFLAGS += $(COMMON_CFLAGS) -std=c++0x
 
 SYS_LIBS += -lrt
 SYS_LIBS += -luuid
+SYS_LIBS += -lcrypto
 
 MAKEFLAGS += --no-print-directory
 

diff --git a/shared_lib/Makefile b/shared_lib/Makefile
@@ -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)

diff --git a/test/unit/lib/iscsi/iscsi.c/Makefile b/test/unit/lib/iscsi/iscsi.c/Makefile
@@ -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