diff --git a/lib/accel/Makefile b/lib/accel/Makefile index a0c0c6e76..a021464ce 100644 --- a/lib/accel/Makefile +++ b/lib/accel/Makefile @@ -34,6 +34,10 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk +SO_VER := 2 +SO_MINOR := 0 +SO_SUFFIX := $(SO_VER).$(SO_MINOR) + LIBNAME = accel C_SRCS = accel_engine.c accel_engine_rpc.c diff --git a/lib/bdev/Makefile b/lib/bdev/Makefile index e8d2dd9ea..dc594e5a5 100644 --- a/lib/bdev/Makefile +++ b/lib/bdev/Makefile @@ -34,6 +34,10 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk +SO_VER := 2 +SO_MINOR := 0 +SO_SUFFIX := $(SO_VER).$(SO_MINOR) + ifeq ($(CONFIG_VTUNE),y) CFLAGS += -I$(CONFIG_VTUNE_DIR)/include -I$(CONFIG_VTUNE_DIR)/sdk/src/ittnotify endif diff --git a/lib/blob/Makefile b/lib/blob/Makefile index c0864a8cf..794b8a5a1 100644 --- a/lib/blob/Makefile +++ b/lib/blob/Makefile @@ -34,6 +34,10 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk +SO_VER := 2 +SO_MINOR := 0 +SO_SUFFIX := $(SO_VER).$(SO_MINOR) + C_SRCS = blobstore.c request.c zeroes.c blob_bs_dev.c LIBNAME = blob diff --git a/lib/blobfs/Makefile b/lib/blobfs/Makefile index ea36b6ab1..09eb094c2 100644 --- a/lib/blobfs/Makefile +++ b/lib/blobfs/Makefile @@ -34,6 +34,10 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk +SO_VER := 2 +SO_MINOR := 0 +SO_SUFFIX := $(SO_VER).$(SO_MINOR) + C_SRCS = blobfs.c tree.c LIBNAME = blobfs diff --git a/lib/conf/Makefile b/lib/conf/Makefile index 0cdfda1d9..6c8d226dc 100644 --- a/lib/conf/Makefile +++ b/lib/conf/Makefile @@ -34,6 +34,10 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk +SO_VER := 2 +SO_MINOR := 0 +SO_SUFFIX := $(SO_VER).$(SO_MINOR) + C_SRCS = conf.c LIBNAME = conf diff --git a/lib/env_dpdk/Makefile b/lib/env_dpdk/Makefile index 9c9188904..605eefbce 100644 --- a/lib/env_dpdk/Makefile +++ b/lib/env_dpdk/Makefile @@ -34,6 +34,10 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk +SO_VER := 2 +SO_MINOR := 0 +SO_SUFFIX := $(SO_VER).$(SO_MINOR) + CFLAGS += $(ENV_CFLAGS) C_SRCS = env.c memory.c pci.c init.c threads.c C_SRCS += pci_nvme.c pci_ioat.c pci_virtio.c pci_vmd.c diff --git a/lib/event/Makefile b/lib/event/Makefile index 79a72b649..09859a301 100644 --- a/lib/event/Makefile +++ b/lib/event/Makefile @@ -34,6 +34,10 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk +SO_VER := 2 +SO_MINOR := 0 +SO_SUFFIX := $(SO_VER).$(SO_MINOR) + LIBNAME = event C_SRCS = app.c reactor.c rpc.c subsystem.c json_config.c diff --git a/lib/ftl/Makefile b/lib/ftl/Makefile index 8720324fe..e78cbfdaf 100644 --- a/lib/ftl/Makefile +++ b/lib/ftl/Makefile @@ -34,6 +34,10 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk +SO_VER := 2 +SO_MINOR := 0 +SO_SUFFIX := $(SO_VER).$(SO_MINOR) + C_SRCS = ftl_band.c ftl_core.c ftl_debug.c ftl_io.c ftl_reloc.c \ ftl_restore.c ftl_init.c ftl_trace.c diff --git a/lib/ioat/Makefile b/lib/ioat/Makefile index d59d607f3..15181cb45 100644 --- a/lib/ioat/Makefile +++ b/lib/ioat/Makefile @@ -34,6 +34,10 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk +SO_VER := 2 +SO_MINOR := 0 +SO_SUFFIX := $(SO_VER).$(SO_MINOR) + C_SRCS = ioat.c LIBNAME = ioat diff --git a/lib/iscsi/Makefile b/lib/iscsi/Makefile index 9cfb71c31..b45a76681 100644 --- a/lib/iscsi/Makefile +++ b/lib/iscsi/Makefile @@ -34,6 +34,10 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk +SO_VER := 2 +SO_MINOR := 0 +SO_SUFFIX := $(SO_VER).$(SO_MINOR) + CFLAGS += -I$(SPDK_ROOT_DIR)/lib C_SRCS = conn.c \ init_grp.c iscsi.c md5.c param.c portal_grp.c \ diff --git a/lib/json/Makefile b/lib/json/Makefile index 8808df9e1..710677579 100644 --- a/lib/json/Makefile +++ b/lib/json/Makefile @@ -34,6 +34,10 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk +SO_VER := 2 +SO_MINOR := 0 +SO_SUFFIX := $(SO_VER).$(SO_MINOR) + C_SRCS = json_parse.c json_util.c json_write.c LIBNAME = json diff --git a/lib/jsonrpc/Makefile b/lib/jsonrpc/Makefile index dd323f1e6..167aa48e5 100644 --- a/lib/jsonrpc/Makefile +++ b/lib/jsonrpc/Makefile @@ -34,6 +34,10 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk +SO_VER := 2 +SO_MINOR := 0 +SO_SUFFIX := $(SO_VER).$(SO_MINOR) + LIBNAME = jsonrpc C_SRCS = jsonrpc_server.c jsonrpc_server_tcp.c C_SRCS += jsonrpc_client.c jsonrpc_client_tcp.c diff --git a/lib/log/Makefile b/lib/log/Makefile index 73c0f55c7..ed577cc5b 100644 --- a/lib/log/Makefile +++ b/lib/log/Makefile @@ -34,6 +34,10 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk +SO_VER := 2 +SO_MINOR := 0 +SO_SUFFIX := $(SO_VER).$(SO_MINOR) + C_SRCS = log.c log_flags.c LIBNAME = log ifeq ($(CONFIG_LOG_BACKTRACE),y) diff --git a/lib/log_rpc/Makefile b/lib/log_rpc/Makefile index bab529484..b0a361334 100644 --- a/lib/log_rpc/Makefile +++ b/lib/log_rpc/Makefile @@ -34,6 +34,10 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk +SO_VER := 2 +SO_MINOR := 0 +SO_SUFFIX := $(SO_VER).$(SO_MINOR) + C_SRCS = log_rpc.c LIBNAME = log_rpc diff --git a/lib/lvol/Makefile b/lib/lvol/Makefile index 49076fbac..153aee2c4 100644 --- a/lib/lvol/Makefile +++ b/lib/lvol/Makefile @@ -34,6 +34,10 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk +SO_VER := 2 +SO_MINOR := 0 +SO_SUFFIX := $(SO_VER).$(SO_MINOR) + C_SRCS = lvol.c LIBNAME = lvol diff --git a/lib/nbd/Makefile b/lib/nbd/Makefile index 419a21580..39f6a275d 100644 --- a/lib/nbd/Makefile +++ b/lib/nbd/Makefile @@ -34,6 +34,10 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk +SO_VER := 2 +SO_MINOR := 0 +SO_SUFFIX := $(SO_VER).$(SO_MINOR) + LIBNAME = nbd C_SRCS = nbd.c nbd_rpc.c diff --git a/lib/net/Makefile b/lib/net/Makefile index 6431e7bea..c02f9d7cb 100644 --- a/lib/net/Makefile +++ b/lib/net/Makefile @@ -34,6 +34,10 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk +SO_VER := 2 +SO_MINOR := 0 +SO_SUFFIX := $(SO_VER).$(SO_MINOR) + C_SRCS = interface.c net_rpc.c LIBNAME = net diff --git a/lib/notify/Makefile b/lib/notify/Makefile index 3cc6f9a85..323e5eda7 100644 --- a/lib/notify/Makefile +++ b/lib/notify/Makefile @@ -34,6 +34,10 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk +SO_VER := 2 +SO_MINOR := 0 +SO_SUFFIX := $(SO_VER).$(SO_MINOR) + C_SRCS = notify.c notify_rpc.c LIBNAME = notify diff --git a/lib/nvme/Makefile b/lib/nvme/Makefile index 5793f4015..9cda30c9c 100644 --- a/lib/nvme/Makefile +++ b/lib/nvme/Makefile @@ -34,6 +34,10 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk +SO_VER := 2 +SO_MINOR := 0 +SO_SUFFIX := $(SO_VER).$(SO_MINOR) + C_SRCS = nvme_ctrlr_cmd.c nvme_ctrlr.c nvme_fabric.c nvme_ns_cmd.c nvme_ns.c nvme_pcie.c nvme_qpair.c nvme.c nvme_quirks.c nvme_transport.c nvme_uevent.c nvme_ctrlr_ocssd_cmd.c \ nvme_ns_ocssd_cmd.c nvme_tcp.c nvme_opal.c nvme_io_msg.c C_SRCS-$(CONFIG_RDMA) += nvme_rdma.c diff --git a/lib/nvmf/Makefile b/lib/nvmf/Makefile index 58952001f..2585bc4c4 100644 --- a/lib/nvmf/Makefile +++ b/lib/nvmf/Makefile @@ -34,6 +34,10 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk +SO_VER := 2 +SO_MINOR := 0 +SO_SUFFIX := $(SO_VER).$(SO_MINOR) + C_SRCS = ctrlr.c ctrlr_discovery.c ctrlr_bdev.c \ subsystem.c nvmf.c nvmf_rpc.c transport.c tcp.c diff --git a/lib/reduce/Makefile b/lib/reduce/Makefile index 8efc0eb5d..2d031cc49 100644 --- a/lib/reduce/Makefile +++ b/lib/reduce/Makefile @@ -34,6 +34,10 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk +SO_VER := 2 +SO_MINOR := 0 +SO_SUFFIX := $(SO_VER).$(SO_MINOR) + C_SRCS = reduce.c LIBNAME = reduce diff --git a/lib/rpc/Makefile b/lib/rpc/Makefile index 024d7a04a..801bcf56e 100644 --- a/lib/rpc/Makefile +++ b/lib/rpc/Makefile @@ -34,6 +34,10 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk +SO_VER := 2 +SO_MINOR := 0 +SO_SUFFIX := $(SO_VER).$(SO_MINOR) + C_SRCS = rpc.c LIBNAME = rpc diff --git a/lib/rte_vhost/Makefile b/lib/rte_vhost/Makefile index 5a42ed390..154352710 100644 --- a/lib/rte_vhost/Makefile +++ b/lib/rte_vhost/Makefile @@ -34,6 +34,10 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk +SO_VER := 2 +SO_MINOR := 0 +SO_SUFFIX := $(SO_VER).$(SO_MINOR) + CFLAGS += -I. CFLAGS += $(ENV_CFLAGS) CFLAGS += -include rte_config.h diff --git a/lib/scsi/Makefile b/lib/scsi/Makefile index f52c0e318..6950006e0 100644 --- a/lib/scsi/Makefile +++ b/lib/scsi/Makefile @@ -34,6 +34,10 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk +SO_VER := 2 +SO_MINOR := 0 +SO_SUFFIX := $(SO_VER).$(SO_MINOR) + C_SRCS = dev.c lun.c port.c scsi.c scsi_bdev.c scsi_pr.c scsi_rpc.c task.c LIBNAME = scsi diff --git a/lib/sock/Makefile b/lib/sock/Makefile index 7d59a12fb..06ce29584 100644 --- a/lib/sock/Makefile +++ b/lib/sock/Makefile @@ -34,6 +34,10 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk +SO_VER := 2 +SO_MINOR := 0 +SO_SUFFIX := $(SO_VER).$(SO_MINOR) + C_SRCS = sock.c net_framework.c LIBNAME = sock diff --git a/lib/thread/Makefile b/lib/thread/Makefile index 467e32ff9..361bba8ad 100644 --- a/lib/thread/Makefile +++ b/lib/thread/Makefile @@ -34,6 +34,10 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk +SO_VER := 2 +SO_MINOR := 0 +SO_SUFFIX := $(SO_VER).$(SO_MINOR) + C_SRCS = thread.c LIBNAME = thread diff --git a/lib/trace/Makefile b/lib/trace/Makefile index 3b8c0006b..90bc46571 100644 --- a/lib/trace/Makefile +++ b/lib/trace/Makefile @@ -34,6 +34,10 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk +SO_VER := 2 +SO_MINOR := 0 +SO_SUFFIX := $(SO_VER).$(SO_MINOR) + C_SRCS = trace.c trace_flags.c trace_rpc.c LIBNAME = trace diff --git a/lib/ut_mock/Makefile b/lib/ut_mock/Makefile index 86c7250dc..178dfb352 100644 --- a/lib/ut_mock/Makefile +++ b/lib/ut_mock/Makefile @@ -34,6 +34,10 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk +SO_VER := 2 +SO_MINOR := 0 +SO_SUFFIX := $(SO_VER).$(SO_MINOR) + C_SRCS = mock.c LIBNAME = ut_mock diff --git a/lib/util/Makefile b/lib/util/Makefile index d6e979240..43996038f 100644 --- a/lib/util/Makefile +++ b/lib/util/Makefile @@ -34,6 +34,10 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk +SO_VER := 2 +SO_MINOR := 0 +SO_SUFFIX := $(SO_VER).$(SO_MINOR) + C_SRCS = base64.c bit_array.c cpuset.c crc16.c crc32.c crc32c.c crc32_ieee.c \ dif.c fd.c file.c iov.c math.c pipe.c strerror_tls.c string.c uuid.c LIBNAME = util diff --git a/lib/vhost/Makefile b/lib/vhost/Makefile index 3d6edea95..1ad7e2e2c 100644 --- a/lib/vhost/Makefile +++ b/lib/vhost/Makefile @@ -34,6 +34,10 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk +SO_VER := 2 +SO_MINOR := 0 +SO_SUFFIX := $(SO_VER).$(SO_MINOR) + CFLAGS += -I. CFLAGS += $(ENV_CFLAGS) diff --git a/lib/virtio/Makefile b/lib/virtio/Makefile index db61c1f21..cc5052177 100644 --- a/lib/virtio/Makefile +++ b/lib/virtio/Makefile @@ -34,6 +34,10 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk +SO_VER := 2 +SO_MINOR := 0 +SO_SUFFIX := $(SO_VER).$(SO_MINOR) + CFLAGS += $(ENV_CFLAGS) C_SRCS = virtio.c virtio_user.c virtio_pci.c C_SRCS += virtio_user/vhost_user.c diff --git a/lib/vmd/Makefile b/lib/vmd/Makefile index d92a17850..656bba272 100644 --- a/lib/vmd/Makefile +++ b/lib/vmd/Makefile @@ -34,6 +34,10 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk +SO_VER := 2 +SO_MINOR := 0 +SO_SUFFIX := $(SO_VER).$(SO_MINOR) + C_SRCS = vmd.c led.c LIBNAME = vmd diff --git a/mk/spdk.common.mk b/mk/spdk.common.mk index f8687dbb1..e5f1c79b7 100644 --- a/mk/spdk.common.mk +++ b/mk/spdk.common.mk @@ -263,17 +263,10 @@ LINK_CXX=\ $(Q)echo " LINK $S/$@"; \ $(CXX) -o $@ $(CPPFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) $(ENV_LINKER_ARGS) $(SYS_LIBS) -# -# Variables to use for versioning shared libs -# -SO_VER := 2 -SO_MINOR := 0 -SO_SUFFIX_ALL := $(SO_VER).$(SO_MINOR) - # Provide function to ease build of a shared lib define spdk_build_realname_shared_lib $(CC) -o $@ -shared $(CPPFLAGS) $(LDFLAGS) \ - -Wl,--soname,$(patsubst %.so.$(SO_SUFFIX_ALL),%.so.$(SO_SUFFIX_ALL),$(notdir $@)) \ + -Wl,--soname,$(notdir $@) \ -Wl,--whole-archive $(1) -Wl,--no-whole-archive \ -Wl,--version-script=$(2) \ $(3) diff --git a/mk/spdk.lib.mk b/mk/spdk.lib.mk index 50429fbe6..49d8a8fdd 100644 --- a/mk/spdk.lib.mk +++ b/mk/spdk.lib.mk @@ -37,7 +37,7 @@ include $(SPDK_ROOT_DIR)/mk/spdk.lib_deps.mk SPDK_MAP_FILE = $(SPDK_ROOT_DIR)/shared_lib/spdk.map LIB := $(call spdk_lib_list_to_static_libs,$(LIBNAME)) SHARED_LINKED_LIB := $(LIB:.a=.so) -SHARED_REALNAME_LIB := $(SHARED_LINKED_LIB:.so=.so.$(SO_SUFFIX_ALL)) +SHARED_REALNAME_LIB := $(SHARED_LINKED_LIB:.so=.so.$(SO_SUFFIX)) ifeq ($(CONFIG_SHARED),y) DEP := $(SHARED_LINKED_LIB) diff --git a/module/accel/ioat/Makefile b/module/accel/ioat/Makefile index d587ba5b0..8c7f92e63 100644 --- a/module/accel/ioat/Makefile +++ b/module/accel/ioat/Makefile @@ -34,6 +34,10 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk +SO_VER := 2 +SO_MINOR := 0 +SO_SUFFIX := $(SO_VER).$(SO_MINOR) + LIBNAME = accel_ioat C_SRCS = accel_engine_ioat.c accel_engine_ioat_rpc.c diff --git a/module/bdev/aio/Makefile b/module/bdev/aio/Makefile index 7a39e3d27..09d6b52e4 100644 --- a/module/bdev/aio/Makefile +++ b/module/bdev/aio/Makefile @@ -34,6 +34,10 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk +SO_VER := 2 +SO_MINOR := 0 +SO_SUFFIX := $(SO_VER).$(SO_MINOR) + C_SRCS = bdev_aio.c bdev_aio_rpc.c LIBNAME = bdev_aio LOCAL_SYS_LIBS = -laio diff --git a/module/bdev/compress/Makefile b/module/bdev/compress/Makefile index 25f0d7094..17d016c55 100644 --- a/module/bdev/compress/Makefile +++ b/module/bdev/compress/Makefile @@ -34,6 +34,10 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk +SO_VER := 2 +SO_MINOR := 0 +SO_SUFFIX := $(SO_VER).$(SO_MINOR) + CFLAGS += -I$(SPDK_ROOT_DIR)/lib/bdev/ C_SRCS = vbdev_compress.c vbdev_compress_rpc.c diff --git a/module/bdev/crypto/Makefile b/module/bdev/crypto/Makefile index 4f31b667d..0fc97382c 100644 --- a/module/bdev/crypto/Makefile +++ b/module/bdev/crypto/Makefile @@ -34,6 +34,10 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk +SO_VER := 2 +SO_MINOR := 0 +SO_SUFFIX := $(SO_VER).$(SO_MINOR) + CFLAGS += $(ENV_CFLAGS) C_SRCS = vbdev_crypto.c vbdev_crypto_rpc.c diff --git a/module/bdev/delay/Makefile b/module/bdev/delay/Makefile index 2abdd53f7..2f4efa679 100644 --- a/module/bdev/delay/Makefile +++ b/module/bdev/delay/Makefile @@ -34,6 +34,10 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk +SO_VER := 2 +SO_MINOR := 0 +SO_SUFFIX := $(SO_VER).$(SO_MINOR) + CFLAGS += -I$(SPDK_ROOT_DIR)/lib/bdev/ C_SRCS = vbdev_delay.c vbdev_delay_rpc.c diff --git a/module/bdev/error/Makefile b/module/bdev/error/Makefile index 96c0d7066..5a5ed2cfa 100644 --- a/module/bdev/error/Makefile +++ b/module/bdev/error/Makefile @@ -34,6 +34,10 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk +SO_VER := 2 +SO_MINOR := 0 +SO_SUFFIX := $(SO_VER).$(SO_MINOR) + C_SRCS = vbdev_error.c vbdev_error_rpc.c LIBNAME = bdev_error diff --git a/module/bdev/ftl/Makefile b/module/bdev/ftl/Makefile index 4e72fb7e5..b8fcaf265 100644 --- a/module/bdev/ftl/Makefile +++ b/module/bdev/ftl/Makefile @@ -34,6 +34,10 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk +SO_VER := 2 +SO_MINOR := 0 +SO_SUFFIX := $(SO_VER).$(SO_MINOR) + C_SRCS += bdev_ftl.c bdev_ftl_rpc.c LIBNAME = bdev_ftl diff --git a/module/bdev/gpt/Makefile b/module/bdev/gpt/Makefile index bb75624b3..675b3dfa3 100644 --- a/module/bdev/gpt/Makefile +++ b/module/bdev/gpt/Makefile @@ -34,6 +34,10 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk +SO_VER := 2 +SO_MINOR := 0 +SO_SUFFIX := $(SO_VER).$(SO_MINOR) + C_SRCS = gpt.c vbdev_gpt.c LIBNAME = bdev_gpt diff --git a/module/bdev/iscsi/Makefile b/module/bdev/iscsi/Makefile index 4a38886d5..6cea0668c 100644 --- a/module/bdev/iscsi/Makefile +++ b/module/bdev/iscsi/Makefile @@ -34,6 +34,10 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk +SO_VER := 2 +SO_MINOR := 0 +SO_SUFFIX := $(SO_VER).$(SO_MINOR) + CFLAGS += -I$(SPDK_ROOT_DIR)/lib/bdev/ # CentOS 7 libiscsi package has functions declared inline but not # defined in the header file. Not aware of any way to disable diff --git a/module/bdev/lvol/Makefile b/module/bdev/lvol/Makefile index f9692afb1..8692fab6f 100644 --- a/module/bdev/lvol/Makefile +++ b/module/bdev/lvol/Makefile @@ -34,6 +34,10 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk +SO_VER := 2 +SO_MINOR := 0 +SO_SUFFIX := $(SO_VER).$(SO_MINOR) + C_SRCS = vbdev_lvol.c vbdev_lvol_rpc.c LIBNAME = bdev_lvol LOCAL_SYS_LIBS = -luuid diff --git a/module/bdev/malloc/Makefile b/module/bdev/malloc/Makefile index f4eb9aaa6..f13b4a602 100644 --- a/module/bdev/malloc/Makefile +++ b/module/bdev/malloc/Makefile @@ -34,6 +34,10 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk +SO_VER := 2 +SO_MINOR := 0 +SO_SUFFIX := $(SO_VER).$(SO_MINOR) + C_SRCS = bdev_malloc.c bdev_malloc_rpc.c LIBNAME = bdev_malloc LOCAL_SYS_LIBS = -luuid diff --git a/module/bdev/null/Makefile b/module/bdev/null/Makefile index 24962e58f..e6e1b6b07 100644 --- a/module/bdev/null/Makefile +++ b/module/bdev/null/Makefile @@ -34,6 +34,10 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk +SO_VER := 2 +SO_MINOR := 0 +SO_SUFFIX := $(SO_VER).$(SO_MINOR) + C_SRCS = bdev_null.c bdev_null_rpc.c LIBNAME = bdev_null diff --git a/module/bdev/nvme/Makefile b/module/bdev/nvme/Makefile index 735048b49..17fed6f4c 100644 --- a/module/bdev/nvme/Makefile +++ b/module/bdev/nvme/Makefile @@ -34,6 +34,10 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk +SO_VER := 2 +SO_MINOR := 0 +SO_SUFFIX := $(SO_VER).$(SO_MINOR) + C_SRCS = bdev_nvme.c bdev_nvme_rpc.c nvme_rpc.c common.c bdev_ocssd.c bdev_ocssd_rpc.c C_SRCS-$(CONFIG_NVME_CUSE) += bdev_nvme_cuse_rpc.c diff --git a/module/bdev/ocf/Makefile b/module/bdev/ocf/Makefile index d63559358..ffc178c77 100644 --- a/module/bdev/ocf/Makefile +++ b/module/bdev/ocf/Makefile @@ -35,6 +35,10 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk +SO_VER := 2 +SO_MINOR := 0 +SO_SUFFIX := $(SO_VER).$(SO_MINOR) + CFLAGS += $(ENV_CFLAGS) -I$(SPDK_ROOT_DIR)/lib/env_ocf -I$(SPDK_ROOT_DIR)/lib/env_ocf/include C_SRCS = $(shell ls *.c) diff --git a/module/bdev/passthru/Makefile b/module/bdev/passthru/Makefile index 7ea24cbef..42f077423 100644 --- a/module/bdev/passthru/Makefile +++ b/module/bdev/passthru/Makefile @@ -34,6 +34,10 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk +SO_VER := 2 +SO_MINOR := 0 +SO_SUFFIX := $(SO_VER).$(SO_MINOR) + CFLAGS += -I$(SPDK_ROOT_DIR)/lib/bdev/ C_SRCS = vbdev_passthru.c vbdev_passthru_rpc.c diff --git a/module/bdev/pmem/Makefile b/module/bdev/pmem/Makefile index 19f0da8ca..fb7f52e26 100644 --- a/module/bdev/pmem/Makefile +++ b/module/bdev/pmem/Makefile @@ -34,6 +34,10 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk +SO_VER := 2 +SO_MINOR := 0 +SO_SUFFIX := $(SO_VER).$(SO_MINOR) + C_SRCS = bdev_pmem.c bdev_pmem_rpc.c LIBNAME = bdev_pmem diff --git a/module/bdev/raid/Makefile b/module/bdev/raid/Makefile index 5e503baa9..88d95c3ba 100644 --- a/module/bdev/raid/Makefile +++ b/module/bdev/raid/Makefile @@ -34,6 +34,10 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk +SO_VER := 2 +SO_MINOR := 0 +SO_SUFFIX := $(SO_VER).$(SO_MINOR) + CFLAGS += -I$(SPDK_ROOT_DIR)/lib/bdev/ C_SRCS = bdev_raid.c bdev_raid_rpc.c raid0.c diff --git a/module/bdev/rbd/Makefile b/module/bdev/rbd/Makefile index e7c97acaf..2a7594826 100644 --- a/module/bdev/rbd/Makefile +++ b/module/bdev/rbd/Makefile @@ -34,6 +34,10 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk +SO_VER := 2 +SO_MINOR := 0 +SO_SUFFIX := $(SO_VER).$(SO_MINOR) + C_SRCS = bdev_rbd.c bdev_rbd_rpc.c LIBNAME = bdev_rbd diff --git a/module/bdev/rpc/Makefile b/module/bdev/rpc/Makefile index 4c1fcc0cf..284073738 100644 --- a/module/bdev/rpc/Makefile +++ b/module/bdev/rpc/Makefile @@ -34,6 +34,10 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk +SO_VER := 2 +SO_MINOR := 0 +SO_SUFFIX := $(SO_VER).$(SO_MINOR) + C_SRCS = bdev_rpc.c LIBNAME = bdev_rpc diff --git a/module/bdev/split/Makefile b/module/bdev/split/Makefile index f29654678..0d4d29203 100644 --- a/module/bdev/split/Makefile +++ b/module/bdev/split/Makefile @@ -34,6 +34,10 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk +SO_VER := 2 +SO_MINOR := 0 +SO_SUFFIX := $(SO_VER).$(SO_MINOR) + C_SRCS = vbdev_split.c vbdev_split_rpc.c LIBNAME = bdev_split diff --git a/module/bdev/uring/Makefile b/module/bdev/uring/Makefile index edf562dd3..dc39b83d0 100644 --- a/module/bdev/uring/Makefile +++ b/module/bdev/uring/Makefile @@ -34,6 +34,10 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk +SO_VER := 2 +SO_MINOR := 0 +SO_SUFFIX := $(SO_VER).$(SO_MINOR) + C_SRCS = bdev_uring.c bdev_uring_rpc.c LIBNAME = bdev_uring LOCAL_SYS_LIBS = -luring diff --git a/module/bdev/virtio/Makefile b/module/bdev/virtio/Makefile index fabe2b9f5..38948410c 100644 --- a/module/bdev/virtio/Makefile +++ b/module/bdev/virtio/Makefile @@ -34,6 +34,10 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk +SO_VER := 2 +SO_MINOR := 0 +SO_SUFFIX := $(SO_VER).$(SO_MINOR) + C_SRCS = bdev_virtio_scsi.c bdev_virtio_blk.c bdev_virtio_rpc.c LIBNAME = bdev_virtio diff --git a/module/bdev/zone_block/Makefile b/module/bdev/zone_block/Makefile index 1b098e1fe..e2eef1a63 100644 --- a/module/bdev/zone_block/Makefile +++ b/module/bdev/zone_block/Makefile @@ -34,6 +34,10 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk +SO_VER := 2 +SO_MINOR := 0 +SO_SUFFIX := $(SO_VER).$(SO_MINOR) + C_SRCS = vbdev_zone_block.c vbdev_zone_block_rpc.c LIBNAME = bdev_zone_block diff --git a/module/blob/bdev/Makefile b/module/blob/bdev/Makefile index dbc25dfb9..347d2c4f8 100644 --- a/module/blob/bdev/Makefile +++ b/module/blob/bdev/Makefile @@ -34,6 +34,10 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk +SO_VER := 2 +SO_MINOR := 0 +SO_SUFFIX := $(SO_VER).$(SO_MINOR) + C_SRCS = blob_bdev.c LIBNAME = blob_bdev diff --git a/module/blobfs/bdev/Makefile b/module/blobfs/bdev/Makefile index 247c99fb5..93299ae08 100644 --- a/module/blobfs/bdev/Makefile +++ b/module/blobfs/bdev/Makefile @@ -34,6 +34,10 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk +SO_VER := 2 +SO_MINOR := 0 +SO_SUFFIX := $(SO_VER).$(SO_MINOR) + C_SRCS = blobfs_bdev.c blobfs_bdev_rpc.c # libfuse3 is required by blobfs_fuse.c diff --git a/module/env_dpdk/Makefile b/module/env_dpdk/Makefile index 1b38df597..957265fd8 100644 --- a/module/env_dpdk/Makefile +++ b/module/env_dpdk/Makefile @@ -34,6 +34,10 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk +SO_VER := 2 +SO_MINOR := 0 +SO_SUFFIX := $(SO_VER).$(SO_MINOR) + C_SRCS = env_dpdk_rpc.c LIBNAME = env_dpdk_rpc diff --git a/module/event/rpc/Makefile b/module/event/rpc/Makefile index fcba526a0..5e6ed7582 100644 --- a/module/event/rpc/Makefile +++ b/module/event/rpc/Makefile @@ -34,6 +34,10 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk +SO_VER := 2 +SO_MINOR := 0 +SO_SUFFIX := $(SO_VER).$(SO_MINOR) + C_SRCS = app_rpc.c subsystem_rpc.c LIBNAME = app_rpc diff --git a/module/event/subsystems/accel/Makefile b/module/event/subsystems/accel/Makefile index ad62e9c63..ea9773a94 100644 --- a/module/event/subsystems/accel/Makefile +++ b/module/event/subsystems/accel/Makefile @@ -34,6 +34,10 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk +SO_VER := 2 +SO_MINOR := 0 +SO_SUFFIX := $(SO_VER).$(SO_MINOR) + C_SRCS = accel.c LIBNAME = event_accel diff --git a/module/event/subsystems/bdev/Makefile b/module/event/subsystems/bdev/Makefile index 58c514190..f8a54f7b1 100644 --- a/module/event/subsystems/bdev/Makefile +++ b/module/event/subsystems/bdev/Makefile @@ -34,6 +34,10 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk +SO_VER := 2 +SO_MINOR := 0 +SO_SUFFIX := $(SO_VER).$(SO_MINOR) + C_SRCS = bdev.c LIBNAME = event_bdev diff --git a/module/event/subsystems/iscsi/Makefile b/module/event/subsystems/iscsi/Makefile index d57f59467..602327297 100644 --- a/module/event/subsystems/iscsi/Makefile +++ b/module/event/subsystems/iscsi/Makefile @@ -34,6 +34,10 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk +SO_VER := 2 +SO_MINOR := 0 +SO_SUFFIX := $(SO_VER).$(SO_MINOR) + CFLAGS += -I$(SPDK_ROOT_DIR)/lib C_SRCS = iscsi.c LIBNAME = event_iscsi diff --git a/module/event/subsystems/nbd/Makefile b/module/event/subsystems/nbd/Makefile index 92d99f154..556c0a57d 100644 --- a/module/event/subsystems/nbd/Makefile +++ b/module/event/subsystems/nbd/Makefile @@ -34,6 +34,10 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk +SO_VER := 2 +SO_MINOR := 0 +SO_SUFFIX := $(SO_VER).$(SO_MINOR) + C_SRCS = nbd.c LIBNAME = event_nbd diff --git a/module/event/subsystems/net/Makefile b/module/event/subsystems/net/Makefile index cf81f07b6..0bfe7e9bd 100644 --- a/module/event/subsystems/net/Makefile +++ b/module/event/subsystems/net/Makefile @@ -34,6 +34,10 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk +SO_VER := 2 +SO_MINOR := 0 +SO_SUFFIX := $(SO_VER).$(SO_MINOR) + C_SRCS = net.c LIBNAME = event_net diff --git a/module/event/subsystems/nvmf/Makefile b/module/event/subsystems/nvmf/Makefile index 68c1a278e..94550a64f 100644 --- a/module/event/subsystems/nvmf/Makefile +++ b/module/event/subsystems/nvmf/Makefile @@ -34,6 +34,10 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk +SO_VER := 2 +SO_MINOR := 0 +SO_SUFFIX := $(SO_VER).$(SO_MINOR) + C_SRCS = conf.c nvmf_rpc.c nvmf_tgt.c LIBNAME = event_nvmf diff --git a/module/event/subsystems/scsi/Makefile b/module/event/subsystems/scsi/Makefile index 12bf15e30..e4eef3d0b 100644 --- a/module/event/subsystems/scsi/Makefile +++ b/module/event/subsystems/scsi/Makefile @@ -34,6 +34,10 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk +SO_VER := 2 +SO_MINOR := 0 +SO_SUFFIX := $(SO_VER).$(SO_MINOR) + C_SRCS = scsi.c LIBNAME = event_scsi diff --git a/module/event/subsystems/vhost/Makefile b/module/event/subsystems/vhost/Makefile index 2e0d61fe0..551434387 100644 --- a/module/event/subsystems/vhost/Makefile +++ b/module/event/subsystems/vhost/Makefile @@ -34,6 +34,10 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk +SO_VER := 2 +SO_MINOR := 0 +SO_SUFFIX := $(SO_VER).$(SO_MINOR) + C_SRCS = vhost.c LIBNAME = event_vhost diff --git a/module/event/subsystems/vmd/Makefile b/module/event/subsystems/vmd/Makefile index 8ead0755e..15a69e453 100644 --- a/module/event/subsystems/vmd/Makefile +++ b/module/event/subsystems/vmd/Makefile @@ -34,6 +34,10 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk +SO_VER := 2 +SO_MINOR := 0 +SO_SUFFIX := $(SO_VER).$(SO_MINOR) + C_SRCS = vmd.c vmd_rpc.c LIBNAME = event_vmd diff --git a/module/sock/posix/Makefile b/module/sock/posix/Makefile index 540694c45..152c57210 100644 --- a/module/sock/posix/Makefile +++ b/module/sock/posix/Makefile @@ -34,6 +34,10 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk +SO_VER := 2 +SO_MINOR := 0 +SO_SUFFIX := $(SO_VER).$(SO_MINOR) + LIBNAME = sock_posix C_SRCS = posix.c diff --git a/module/sock/vpp/Makefile b/module/sock/vpp/Makefile index c62b58d63..46e67c2d4 100644 --- a/module/sock/vpp/Makefile +++ b/module/sock/vpp/Makefile @@ -34,6 +34,10 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk +SO_VER := 2 +SO_MINOR := 0 +SO_SUFFIX := $(SO_VER).$(SO_MINOR) + C_SRCS += vpp.c CFLAGS += -Wno-sign-compare -Wno-error=old-style-definition CFLAGS += -Wno-error=strict-prototypes -Wno-error=ignored-qualifiers diff --git a/shared_lib/Makefile b/shared_lib/Makefile index 2dfbaf5ce..4d7a0f26e 100644 --- a/shared_lib/Makefile +++ b/shared_lib/Makefile @@ -36,9 +36,13 @@ include $(SPDK_ROOT_DIR)/mk/spdk.common.mk include $(SPDK_ROOT_DIR)/mk/spdk.app.mk include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk +SO_VER := 2 +SO_MINOR := 0 +SO_SUFFIX := $(SO_VER).$(SO_MINOR) + # Build combined libspdk.so shared library SHARED_LINKED_LIB := $(SPDK_ROOT_DIR)/build/lib/libspdk.so -SHARED_REALNAME_LIB := $(SHARED_LINKED_LIB).$(SO_SUFFIX_ALL) +SHARED_REALNAME_LIB := $(SHARED_LINKED_LIB).$(SO_SUFFIX) IGNORED_LIBS := libspdk.so IGNORED_LIBS += libspdk_ut_mock.so IGNORED_LIBS += libspdk_env_dpdk.so