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

build: include -lrt and -lpthread in LDFLAGS

Browse Source 
Simplify the build rules so that common libraries are always linked.

Also fix up a couple of -lpciaccess instances that should have been
changed to $(PCIACCESS_LIB).

Change-Id: I4c50fa3aa59cae013d3385e38fbb830794299f6e
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
This commit is contained in:
Daniel Verkamp 2016-06-22 09:23:27 -07:00
parent 4db1b420f4
commit 39cc59635a
24 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/nvmf_tgt/Makefile
View File

@ -57,7 +57,7 @@ SPDK_LIBS = \
LIBS += $(SPDK_LIBS) $(PCIACCESS_LIB) LIBS += $(SPDK_LIBS) $(PCIACCESS_LIB)
LIBS += -libverbs -lrdmacm LIBS += -libverbs -lrdmacm
LIBS += $(DPDK_LIB) -lpthread -lrt LIBS += $(DPDK_LIB)
all : $(APP) all : $(APP)

1
app/trace/Makefile
View File

@ -34,7 +34,6 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
LIBS += -lrt
CXXFLAGS += $(DPDK_INC) CXXFLAGS += $(DPDK_INC)
CXX_SRCS := trace.cpp CXX_SRCS := trace.cpp

2
examples/ioat/kperf/Makefile
View File

@ -40,8 +40,6 @@ C_SRCS := ioat_kperf.c
CFLAGS += -I. CFLAGS += -I.
LIBS += -lrt
all: $(APP) all: $(APP)
$(APP): $(OBJS) $(APP): $(OBJS)

2
examples/ioat/perf/Makefile
View File

@ -44,7 +44,7 @@ SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/ioat/libspdk_ioat.a \
$(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \ $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
$(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a $(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a
LIBS += $(SPDK_LIBS) $(PCIACCESS_LIB) -lpthread $(DPDK_LIB) -lrt LIBS += $(SPDK_LIBS) $(PCIACCESS_LIB) $(DPDK_LIB)
all: $(APP) all: $(APP)

2
examples/ioat/verify/Makefile
View File

@ -44,7 +44,7 @@ SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/ioat/libspdk_ioat.a \
$(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \ $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
$(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a $(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a
LIBS += $(SPDK_LIBS) $(PCIACCESS_LIB) -lpthread $(DPDK_LIB) -lrt LIBS += $(SPDK_LIBS) $(PCIACCESS_LIB) $(DPDK_LIB)
all: $(APP) all: $(APP)

2
examples/nvme/arbitration/Makefile
View File

@ -44,7 +44,7 @@ SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/nvme/libspdk_nvme.a \
$(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \ $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
$(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a $(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a
LIBS += $(SPDK_LIBS) $(PCIACCESS_LIB) -lpthread $(DPDK_LIB) -lrt LIBS += $(SPDK_LIBS) $(PCIACCESS_LIB) $(DPDK_LIB)
all : $(APP) all : $(APP)

2
examples/nvme/fio_plugin/Makefile
View File

@ -48,7 +48,7 @@ SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/nvme/libspdk_nvme.a \
$(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \ $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
$(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a $(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a
LIBS += $(SPDK_LIBS) $(PCIACCESS_LIB) $(DPDK_LIB) -lpthread -lrt LIBS += $(SPDK_LIBS) $(PCIACCESS_LIB) $(DPDK_LIB)
all : $(APP) all : $(APP)

2
examples/nvme/hello_world/Makefile
View File

@ -44,7 +44,7 @@ SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/nvme/libspdk_nvme.a \
$(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \ $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
$(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a $(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a
LIBS += $(SPDK_LIBS) $(PCIACCESS_LIB) -lpthread $(DPDK_LIB) -lrt LIBS += $(SPDK_LIBS) $(PCIACCESS_LIB) $(DPDK_LIB)
all : $(APP) all : $(APP)

2
examples/nvme/identify/Makefile
View File

@ -44,7 +44,7 @@ SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/nvme/libspdk_nvme.a \
$(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \ $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
$(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a $(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a
LIBS += $(SPDK_LIBS) $(PCIACCESS_LIB) -lpthread $(DPDK_LIB) -lrt LIBS += $(SPDK_LIBS) $(PCIACCESS_LIB) $(DPDK_LIB)
all : $(APP) all : $(APP)

2
examples/nvme/nvme_manage/Makefile
View File

@ -44,7 +44,7 @@ SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/nvme/libspdk_nvme.a \
$(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \ $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
$(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a $(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a
LIBS += $(SPDK_LIBS) -lpciaccess -lpthread $(DPDK_LIB) -lrt LIBS += $(SPDK_LIBS) $(PCIACCESS_LIB) $(DPDK_LIB)
all : $(APP) all : $(APP)

2
examples/nvme/perf/Makefile
View File

@ -44,7 +44,7 @@ SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/nvme/libspdk_nvme.a \
$(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \ $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
$(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a $(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a
LIBS += $(SPDK_LIBS) $(PCIACCESS_LIB) -lpthread $(DPDK_LIB) -lrt LIBS += $(SPDK_LIBS) $(PCIACCESS_LIB) $(DPDK_LIB)
ifeq ($(OS),Linux) ifeq ($(OS),Linux)
LIBS += -laio LIBS += -laio

2
examples/nvme/reserve/Makefile
View File

@ -44,7 +44,7 @@ SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/nvme/libspdk_nvme.a \
$(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \ $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
$(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a $(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a
LIBS += $(SPDK_LIBS) $(PCIACCESS_LIB) -lpthread $(DPDK_LIB) -lrt LIBS += $(SPDK_LIBS) $(PCIACCESS_LIB) $(DPDK_LIB)
all : $(APP) all : $(APP)

2
mk/ioat.unittest.mk
View File

@ -39,7 +39,7 @@ C_SRCS = $(TEST_FILE) $(OTHER_FILES)
CFLAGS += -I$(SPDK_ROOT_DIR)/lib -include $(SPDK_ROOT_DIR)/test/lib/ioat/unit/ioat_impl.h CFLAGS += -I$(SPDK_ROOT_DIR)/lib -include $(SPDK_ROOT_DIR)/test/lib/ioat/unit/ioat_impl.h
LIBS += -lcunit -lpthread LIBS += -lcunit
APP = $(TEST_FILE:.c=) APP = $(TEST_FILE:.c=)

2
mk/json.unittest.mk
View File

@ -43,7 +43,7 @@ CFLAGS += -I$(JSONRPC_DIR)
CFLAGS += -I$(SPDK_ROOT_DIR)/lib CFLAGS += -I$(SPDK_ROOT_DIR)/lib
CFLAGS += -I$(SPDK_ROOT_DIR)/test CFLAGS += -I$(SPDK_ROOT_DIR)/test
LIBS += -lcunit -lpthread LIBS += -lcunit
APP = $(TEST_FILE:.c=) APP = $(TEST_FILE:.c=)

2
mk/nvme.unittest.mk
View File

@ -40,7 +40,7 @@ C_SRCS = $(TEST_FILE) $(OTHER_FILES)
CFLAGS += -I$(SPDK_ROOT_DIR)/lib -include $(SPDK_ROOT_DIR)/test/lib/nvme/unit/nvme_impl.h CFLAGS += -I$(SPDK_ROOT_DIR)/lib -include $(SPDK_ROOT_DIR)/test/lib/nvme/unit/nvme_impl.h
CFLAGS += -I$(SPDK_ROOT_DIR)/test CFLAGS += -I$(SPDK_ROOT_DIR)/test
LIBS += -lcunit -lpthread LIBS += -lcunit
APP = $(TEST_FILE:.c=) APP = $(TEST_FILE:.c=)

2
mk/spdk.common.mk
View File

@ -104,6 +104,8 @@ COMMON_CFLAGS += -fsanitize=address
LDFLAGS += -fsanitize=address LDFLAGS += -fsanitize=address
endif endif
LDFLAGS += -lpthread -lrt
MAKEFLAGS += --no-print-directory MAKEFLAGS += --no-print-directory
OBJS = $(C_SRCS:.c=.o) $(CXX_SRCS:.cpp=.o) OBJS = $(C_SRCS:.c=.o) $(CXX_SRCS:.cpp=.o)

2
test/lib/event/event/Makefile
View File

@ -44,7 +44,7 @@ SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/event/libspdk_event.a \
$(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \ $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
$(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \ $(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \
LIBS += $(SPDK_LIBS) -lpthread $(DPDK_LIB) -lrt LIBS += $(SPDK_LIBS) $(DPDK_LIB)
all : $(APP) all : $(APP)

2
test/lib/event/subsystem/Makefile
View File

@ -44,7 +44,7 @@ SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/event/libspdk_event.a \
$(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \ $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
$(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \ $(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \
LIBS += $(SPDK_LIBS) -lpthread -lrt -lcunit LIBS += $(SPDK_LIBS) -lcunit
all : $(APP) all : $(APP)

2
test/lib/memory/Makefile
View File

@ -42,7 +42,7 @@ CFLAGS += $(DPDK_INC)
SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a
LIBS += $(SPDK_LIBS) -lpthread $(DPDK_LIB) -lrt LIBS += $(SPDK_LIBS) $(DPDK_LIB)
all: $(APP) all: $(APP)

2
test/lib/nvme/aer/Makefile
View File

@ -44,7 +44,7 @@ SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/nvme/libspdk_nvme.a \
$(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \ $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
$(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a $(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a
LIBS += $(SPDK_LIBS) $(PCIACCESS_LIB) -lpthread $(DPDK_LIB) -lrt LIBS += $(SPDK_LIBS) $(PCIACCESS_LIB) $(DPDK_LIB)
all : $(APP) all : $(APP)

2
test/lib/nvme/e2edp/Makefile
View File

@ -44,7 +44,7 @@ SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/nvme/libspdk_nvme.a \
$(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \ $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
$(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a $(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a
LIBS += $(SPDK_LIBS) $(PCIACCESS_LIB) -lpthread $(DPDK_LIB) -lrt LIBS += $(SPDK_LIBS) $(PCIACCESS_LIB) $(DPDK_LIB)
all : $(APP) all : $(APP)

2
test/lib/nvme/reset/Makefile
View File

@ -44,7 +44,7 @@ SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/nvme/libspdk_nvme.a \
$(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \ $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
$(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a $(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a
LIBS += $(SPDK_LIBS) $(PCIACCESS_LIB) -lpthread $(DPDK_LIB) -lrt LIBS += $(SPDK_LIBS) $(PCIACCESS_LIB) $(DPDK_LIB)
all : $(APP) all : $(APP)

2
test/lib/nvme/sgl/Makefile
View File

@ -44,7 +44,7 @@ SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/nvme/libspdk_nvme.a \
$(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \ $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
$(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a $(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a
LIBS += $(SPDK_LIBS) $(PCIACCESS_LIB) -lpthread $(DPDK_LIB) -lrt LIBS += $(SPDK_LIBS) $(PCIACCESS_LIB) $(DPDK_LIB)
all : $(APP) all : $(APP)

2
test/lib/nvmf/nvmf_c/Makefile
View File

@ -40,7 +40,7 @@ SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \
$(SPDK_ROOT_DIR)/lib/trace/libspdk_trace.a \ $(SPDK_ROOT_DIR)/lib/trace/libspdk_trace.a \
$(SPDK_ROOT_DIR)/lib/event/libspdk_event.a \ $(SPDK_ROOT_DIR)/lib/event/libspdk_event.a \
LIBS += $(SPDK_LIBS) $(PCIACCESS_LIB) -lpthread $(DPDK_LIB) -lrt LIBS += $(SPDK_LIBS) $(PCIACCESS_LIB) $(DPDK_LIB)
TEST_FILE = nvmf_ut.c TEST_FILE = nvmf_ut.c