From 39cc59635a5407444806f85a418efe1f83d6bab4 Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Wed, 22 Jun 2016 09:23:27 -0700 Subject: [PATCH] build: include -lrt and -lpthread in LDFLAGS 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 --- app/nvmf_tgt/Makefile | 2 +- app/trace/Makefile | 1 - examples/ioat/kperf/Makefile | 2 -- examples/ioat/perf/Makefile | 2 +- examples/ioat/verify/Makefile | 2 +- examples/nvme/arbitration/Makefile | 2 +- examples/nvme/fio_plugin/Makefile | 2 +- examples/nvme/hello_world/Makefile | 2 +- examples/nvme/identify/Makefile | 2 +- examples/nvme/nvme_manage/Makefile | 2 +- examples/nvme/perf/Makefile | 2 +- examples/nvme/reserve/Makefile | 2 +- mk/ioat.unittest.mk | 2 +- mk/json.unittest.mk | 2 +- mk/nvme.unittest.mk | 2 +- mk/spdk.common.mk | 2 ++ test/lib/event/event/Makefile | 2 +- test/lib/event/subsystem/Makefile | 2 +- test/lib/memory/Makefile | 2 +- test/lib/nvme/aer/Makefile | 2 +- test/lib/nvme/e2edp/Makefile | 2 +- test/lib/nvme/reset/Makefile | 2 +- test/lib/nvme/sgl/Makefile | 2 +- test/lib/nvmf/nvmf_c/Makefile | 2 +- 24 files changed, 23 insertions(+), 24 deletions(-) diff --git a/app/nvmf_tgt/Makefile b/app/nvmf_tgt/Makefile index 7511e1965..646e4bb60 100644 --- a/app/nvmf_tgt/Makefile +++ b/app/nvmf_tgt/Makefile @@ -57,7 +57,7 @@ SPDK_LIBS = \ LIBS += $(SPDK_LIBS) $(PCIACCESS_LIB) LIBS += -libverbs -lrdmacm -LIBS += $(DPDK_LIB) -lpthread -lrt +LIBS += $(DPDK_LIB) all : $(APP) diff --git a/app/trace/Makefile b/app/trace/Makefile index c821c242e..01122e23d 100644 --- a/app/trace/Makefile +++ b/app/trace/Makefile @@ -34,7 +34,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -LIBS += -lrt CXXFLAGS += $(DPDK_INC) CXX_SRCS := trace.cpp diff --git a/examples/ioat/kperf/Makefile b/examples/ioat/kperf/Makefile index 13544ce1b..ba1d8e8c6 100644 --- a/examples/ioat/kperf/Makefile +++ b/examples/ioat/kperf/Makefile @@ -40,8 +40,6 @@ C_SRCS := ioat_kperf.c CFLAGS += -I. -LIBS += -lrt - all: $(APP) $(APP): $(OBJS) diff --git a/examples/ioat/perf/Makefile b/examples/ioat/perf/Makefile index 59db10b3f..ae78a2fc8 100644 --- a/examples/ioat/perf/Makefile +++ b/examples/ioat/perf/Makefile @@ -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/memory/libspdk_memory.a -LIBS += $(SPDK_LIBS) $(PCIACCESS_LIB) -lpthread $(DPDK_LIB) -lrt +LIBS += $(SPDK_LIBS) $(PCIACCESS_LIB) $(DPDK_LIB) all: $(APP) diff --git a/examples/ioat/verify/Makefile b/examples/ioat/verify/Makefile index 217a7d2ef..1274bdf1e 100644 --- a/examples/ioat/verify/Makefile +++ b/examples/ioat/verify/Makefile @@ -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/memory/libspdk_memory.a -LIBS += $(SPDK_LIBS) $(PCIACCESS_LIB) -lpthread $(DPDK_LIB) -lrt +LIBS += $(SPDK_LIBS) $(PCIACCESS_LIB) $(DPDK_LIB) all: $(APP) diff --git a/examples/nvme/arbitration/Makefile b/examples/nvme/arbitration/Makefile index 25f6379a0..5102624c1 100644 --- a/examples/nvme/arbitration/Makefile +++ b/examples/nvme/arbitration/Makefile @@ -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/memory/libspdk_memory.a -LIBS += $(SPDK_LIBS) $(PCIACCESS_LIB) -lpthread $(DPDK_LIB) -lrt +LIBS += $(SPDK_LIBS) $(PCIACCESS_LIB) $(DPDK_LIB) all : $(APP) diff --git a/examples/nvme/fio_plugin/Makefile b/examples/nvme/fio_plugin/Makefile index e820bed00..56553725c 100644 --- a/examples/nvme/fio_plugin/Makefile +++ b/examples/nvme/fio_plugin/Makefile @@ -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/memory/libspdk_memory.a -LIBS += $(SPDK_LIBS) $(PCIACCESS_LIB) $(DPDK_LIB) -lpthread -lrt +LIBS += $(SPDK_LIBS) $(PCIACCESS_LIB) $(DPDK_LIB) all : $(APP) diff --git a/examples/nvme/hello_world/Makefile b/examples/nvme/hello_world/Makefile index 363ba0011..8c2e4318f 100644 --- a/examples/nvme/hello_world/Makefile +++ b/examples/nvme/hello_world/Makefile @@ -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/memory/libspdk_memory.a -LIBS += $(SPDK_LIBS) $(PCIACCESS_LIB) -lpthread $(DPDK_LIB) -lrt +LIBS += $(SPDK_LIBS) $(PCIACCESS_LIB) $(DPDK_LIB) all : $(APP) diff --git a/examples/nvme/identify/Makefile b/examples/nvme/identify/Makefile index 528938044..59d00de5b 100644 --- a/examples/nvme/identify/Makefile +++ b/examples/nvme/identify/Makefile @@ -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/memory/libspdk_memory.a -LIBS += $(SPDK_LIBS) $(PCIACCESS_LIB) -lpthread $(DPDK_LIB) -lrt +LIBS += $(SPDK_LIBS) $(PCIACCESS_LIB) $(DPDK_LIB) all : $(APP) diff --git a/examples/nvme/nvme_manage/Makefile b/examples/nvme/nvme_manage/Makefile index bcaf5670a..eae9f1c6e 100644 --- a/examples/nvme/nvme_manage/Makefile +++ b/examples/nvme/nvme_manage/Makefile @@ -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/memory/libspdk_memory.a -LIBS += $(SPDK_LIBS) -lpciaccess -lpthread $(DPDK_LIB) -lrt +LIBS += $(SPDK_LIBS) $(PCIACCESS_LIB) $(DPDK_LIB) all : $(APP) diff --git a/examples/nvme/perf/Makefile b/examples/nvme/perf/Makefile index 3684bffa7..e1efd63dd 100644 --- a/examples/nvme/perf/Makefile +++ b/examples/nvme/perf/Makefile @@ -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/memory/libspdk_memory.a -LIBS += $(SPDK_LIBS) $(PCIACCESS_LIB) -lpthread $(DPDK_LIB) -lrt +LIBS += $(SPDK_LIBS) $(PCIACCESS_LIB) $(DPDK_LIB) ifeq ($(OS),Linux) LIBS += -laio diff --git a/examples/nvme/reserve/Makefile b/examples/nvme/reserve/Makefile index 4521c161b..4b246cd74 100644 --- a/examples/nvme/reserve/Makefile +++ b/examples/nvme/reserve/Makefile @@ -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/memory/libspdk_memory.a -LIBS += $(SPDK_LIBS) $(PCIACCESS_LIB) -lpthread $(DPDK_LIB) -lrt +LIBS += $(SPDK_LIBS) $(PCIACCESS_LIB) $(DPDK_LIB) all : $(APP) diff --git a/mk/ioat.unittest.mk b/mk/ioat.unittest.mk index 2a9b01845..d4e2ebe39 100644 --- a/mk/ioat.unittest.mk +++ b/mk/ioat.unittest.mk @@ -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 -LIBS += -lcunit -lpthread +LIBS += -lcunit APP = $(TEST_FILE:.c=) diff --git a/mk/json.unittest.mk b/mk/json.unittest.mk index bf8530ed5..480a9bfab 100644 --- a/mk/json.unittest.mk +++ b/mk/json.unittest.mk @@ -43,7 +43,7 @@ CFLAGS += -I$(JSONRPC_DIR) CFLAGS += -I$(SPDK_ROOT_DIR)/lib CFLAGS += -I$(SPDK_ROOT_DIR)/test -LIBS += -lcunit -lpthread +LIBS += -lcunit APP = $(TEST_FILE:.c=) diff --git a/mk/nvme.unittest.mk b/mk/nvme.unittest.mk index a1689c40d..5a98cedc8 100644 --- a/mk/nvme.unittest.mk +++ b/mk/nvme.unittest.mk @@ -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)/test -LIBS += -lcunit -lpthread +LIBS += -lcunit APP = $(TEST_FILE:.c=) diff --git a/mk/spdk.common.mk b/mk/spdk.common.mk index 6f89b52f4..5e3b07b8a 100644 --- a/mk/spdk.common.mk +++ b/mk/spdk.common.mk @@ -104,6 +104,8 @@ COMMON_CFLAGS += -fsanitize=address LDFLAGS += -fsanitize=address endif +LDFLAGS += -lpthread -lrt + MAKEFLAGS += --no-print-directory OBJS = $(C_SRCS:.c=.o) $(CXX_SRCS:.cpp=.o) diff --git a/test/lib/event/event/Makefile b/test/lib/event/event/Makefile index 595348294..35287fcc1 100644 --- a/test/lib/event/event/Makefile +++ b/test/lib/event/event/Makefile @@ -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/log/libspdk_log.a \ -LIBS += $(SPDK_LIBS) -lpthread $(DPDK_LIB) -lrt +LIBS += $(SPDK_LIBS) $(DPDK_LIB) all : $(APP) diff --git a/test/lib/event/subsystem/Makefile b/test/lib/event/subsystem/Makefile index 494d130fb..d4338ccce 100644 --- a/test/lib/event/subsystem/Makefile +++ b/test/lib/event/subsystem/Makefile @@ -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/log/libspdk_log.a \ -LIBS += $(SPDK_LIBS) -lpthread -lrt -lcunit +LIBS += $(SPDK_LIBS) -lcunit all : $(APP) diff --git a/test/lib/memory/Makefile b/test/lib/memory/Makefile index 7804ce1be..9d1ae0392 100644 --- a/test/lib/memory/Makefile +++ b/test/lib/memory/Makefile @@ -42,7 +42,7 @@ CFLAGS += $(DPDK_INC) SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a -LIBS += $(SPDK_LIBS) -lpthread $(DPDK_LIB) -lrt +LIBS += $(SPDK_LIBS) $(DPDK_LIB) all: $(APP) diff --git a/test/lib/nvme/aer/Makefile b/test/lib/nvme/aer/Makefile index 23f5d2e8d..3298730ab 100644 --- a/test/lib/nvme/aer/Makefile +++ b/test/lib/nvme/aer/Makefile @@ -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/memory/libspdk_memory.a -LIBS += $(SPDK_LIBS) $(PCIACCESS_LIB) -lpthread $(DPDK_LIB) -lrt +LIBS += $(SPDK_LIBS) $(PCIACCESS_LIB) $(DPDK_LIB) all : $(APP) diff --git a/test/lib/nvme/e2edp/Makefile b/test/lib/nvme/e2edp/Makefile index 975360f48..680881133 100644 --- a/test/lib/nvme/e2edp/Makefile +++ b/test/lib/nvme/e2edp/Makefile @@ -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/memory/libspdk_memory.a -LIBS += $(SPDK_LIBS) $(PCIACCESS_LIB) -lpthread $(DPDK_LIB) -lrt +LIBS += $(SPDK_LIBS) $(PCIACCESS_LIB) $(DPDK_LIB) all : $(APP) diff --git a/test/lib/nvme/reset/Makefile b/test/lib/nvme/reset/Makefile index 55f0b7716..6ac9789d1 100644 --- a/test/lib/nvme/reset/Makefile +++ b/test/lib/nvme/reset/Makefile @@ -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/memory/libspdk_memory.a -LIBS += $(SPDK_LIBS) $(PCIACCESS_LIB) -lpthread $(DPDK_LIB) -lrt +LIBS += $(SPDK_LIBS) $(PCIACCESS_LIB) $(DPDK_LIB) all : $(APP) diff --git a/test/lib/nvme/sgl/Makefile b/test/lib/nvme/sgl/Makefile index 8cd76cd5f..f3c26b9a2 100644 --- a/test/lib/nvme/sgl/Makefile +++ b/test/lib/nvme/sgl/Makefile @@ -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/memory/libspdk_memory.a -LIBS += $(SPDK_LIBS) $(PCIACCESS_LIB) -lpthread $(DPDK_LIB) -lrt +LIBS += $(SPDK_LIBS) $(PCIACCESS_LIB) $(DPDK_LIB) all : $(APP) diff --git a/test/lib/nvmf/nvmf_c/Makefile b/test/lib/nvmf/nvmf_c/Makefile index 66f1c6eb0..53f70bc52 100644 --- a/test/lib/nvmf/nvmf_c/Makefile +++ b/test/lib/nvmf/nvmf_c/Makefile @@ -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/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