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

mk: Add all external libs to sys_libs

Browse Source 
This allows us to better distinguish between external and internal libs.
This series is aimed at fixing github issue 434
Change-Id: I2ed141f909e7c4a800df02061007b0d23da25380
Signed-off-by: Seth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/425434
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Lance Hartmann <lance.hartmann@oracle.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Seth Howell 2018-09-12 12:39:09 -07:00 committed by Jim Harris
parent fbb599288f
commit c58d3c445b
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/nvme/perf/Makefile
View File

@ -37,7 +37,7 @@ include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
APP = perf APP = perf
ifeq ($(OS),Linux) ifeq ($(OS),Linux)
LIBS += -laio SYS_LIBS += -laio
CFLAGS += -DHAVE_LIBAIO CFLAGS += -DHAVE_LIBAIO
endif endif

2
mk/nvme.libtest.mk
View File

@ -45,7 +45,7 @@ LIBS += $(SOCK_MODULES_LINKER_ARGS)
LIBS += $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS) LIBS += $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS)
ifeq ($(CONFIG_RDMA),y) ifeq ($(CONFIG_RDMA),y)
LIBS += -libverbs -lrdmacm SYS_LIBS += -libverbs -lrdmacm
endif endif
all: $(APP) all: $(APP)

10
mk/spdk.common.mk
View File

@ -130,23 +130,23 @@ ifeq ($(OS),FreeBSD)
ifeq ($(CONFIG_RDMA),y) ifeq ($(CONFIG_RDMA),y)
# RDMA Userspace Verbs Library # RDMA Userspace Verbs Library
ifneq ("$(wildcard /usr/lib/libibverbs.*)","") ifneq ("$(wildcard /usr/lib/libibverbs.*)","")
LIBS += -libverbs SYS_LIBS += -libverbs
endif endif
# RDMA Connection Manager Library # RDMA Connection Manager Library
ifneq ("$(wildcard /usr/lib/librdmacm.*)","") ifneq ("$(wildcard /usr/lib/librdmacm.*)","")
LIBS += -lrdmacm SYS_LIBS += -lrdmacm
endif endif
# Mellanox - MLX4 HBA Userspace Library # Mellanox - MLX4 HBA Userspace Library
ifneq ("$(wildcard /usr/lib/libmlx4.*)","") ifneq ("$(wildcard /usr/lib/libmlx4.*)","")
LIBS += -lmlx4 SYS_LIBS += -lmlx4
endif endif
# Mellanox - MLX5 HBA Userspace Library # Mellanox - MLX5 HBA Userspace Library
ifneq ("$(wildcard /usr/lib/libmlx5.*)","") ifneq ("$(wildcard /usr/lib/libmlx5.*)","")
LIBS += -lmlx5 SYS_LIBS += -lmlx5
endif endif
# Chelsio HBA Userspace Library # Chelsio HBA Userspace Library
ifneq ("$(wildcard /usr/lib/libcxgb4.*)","") ifneq ("$(wildcard /usr/lib/libcxgb4.*)","")
LIBS += -lcxgb4 SYS_LIBS += -lcxgb4
endif endif
endif endif
endif endif

2
test/app/stub/Makefile
View File

@ -47,7 +47,7 @@ LIBS += $(SPDK_LIB_LINKER_ARGS)
LIBS += $(ENV_LINKER_ARGS) LIBS += $(ENV_LINKER_ARGS)
ifeq ($(CONFIG_RDMA),y) ifeq ($(CONFIG_RDMA),y)
LIBS += -libverbs -lrdmacm SYS_LIBS += -libverbs -lrdmacm
endif endif
all : $(APP) all : $(APP)

2
test/nvme/overhead/Makefile
View File

@ -37,7 +37,7 @@ include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
APP = overhead APP = overhead
ifeq ($(OS),Linux) ifeq ($(OS),Linux)
LIBS += -laio SYS_LIBS += -laio
CFLAGS += -DHAVE_LIBAIO CFLAGS += -DHAVE_LIBAIO
endif endif