ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: add -lcrypto (OpenSSL) to SYS_LIBS

Browse Source 
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 <daniel.verkamp@intel.com>
Reviewed-on: https://review.gerrithub.io/415351
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Daniel Verkamp 2018-06-14 14:50:29 -07:00
parent 65c48bfb95
commit fdf5c1d7d2
5 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/iscsi_tgt/Makefile
View File

@ -55,7 +55,7 @@ endif
LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \ LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \
$(COPY_MODULES_LINKER_ARGS) \ $(COPY_MODULES_LINKER_ARGS) \
$(NET_MODULES_LINKER_ARGS) $(NET_MODULES_LINKER_ARGS)
LIBS += $(SPDK_LIB_LINKER_ARGS) -lcrypto LIBS += $(SPDK_LIB_LINKER_ARGS)
LIBS += $(ENV_LINKER_ARGS) LIBS += $(ENV_LINKER_ARGS)
all : $(APP) all : $(APP)

1
app/spdk_tgt/Makefile
View File

@ -57,7 +57,6 @@ LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \
$(COPY_MODULES_LINKER_ARGS) \ $(COPY_MODULES_LINKER_ARGS) \
$(NET_MODULES_LINKER_ARGS) \ $(NET_MODULES_LINKER_ARGS) \
$(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS) $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS)
LIBS += -lcrypto
all: $(APP) all: $(APP)
@: @:

1
mk/spdk.common.mk
View File

@ -192,6 +192,7 @@ CXXFLAGS += $(COMMON_CFLAGS) -std=c++0x
SYS_LIBS += -lrt SYS_LIBS += -lrt
SYS_LIBS += -luuid SYS_LIBS += -luuid
SYS_LIBS += -lcrypto
MAKEFLAGS += --no-print-directory MAKEFLAGS += --no-print-directory

1
shared_lib/Makefile
View File

@ -91,7 +91,6 @@ $(SHARED_LIB): $(SPDK_LIB_FILES) $(SPDK_WHOLE_LIBS) $(BLOCKDEV_MODULES_FILES) $(
$(filter-out -Wl$(comma)--no-whole-archive,$(LIBS)) \ $(filter-out -Wl$(comma)--no-whole-archive,$(LIBS)) \
-Wl,--no-whole-archive \ -Wl,--no-whole-archive \
-Wl,--version-script=spdk.map \ -Wl,--version-script=spdk.map \
-lcrypto \
$(SYS_LIBS) $(SYS_LIBS)
.PHONY: all clean $(DIRS-y) .PHONY: all clean $(DIRS-y)

2
test/unit/lib/iscsi/iscsi.c/Makefile
View File

@ -41,7 +41,7 @@ SCSI_OBJS = port
ISCSI_OBJS = md5 param ISCSI_OBJS = md5 param
LIBS += $(SCSI_OBJS:%=$(SPDK_ROOT_DIR)/lib/scsi/%.o) LIBS += $(SCSI_OBJS:%=$(SPDK_ROOT_DIR)/lib/scsi/%.o)
LIBS += $(ISCSI_OBJS:%=$(SPDK_ROOT_DIR)/lib/iscsi/%.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 TEST_FILE = iscsi_ut.c