Commit 45d47f68 authored May 28, 2025 by Anton Nayshtut Committed by Tomasz Zawadzki Jul 03, 2025

Fix compilation with --with-uring



liburing installs its header files to $prefix/include and its libraries
to $prefix/lib. This patch corrects the include and library paths when
compiling with liburing.

In addition, it removes redundant compilation and linkage flags related
to liburing.

Change-Id: I9970b85e72cc92fce726c505cbc6f899c1eb5c66
Signed-off-by: Anton Nayshtut <anayshtut@nvidia.com>
Reviewed-on: https://review.spdk.io/c/spdk/spdk/+/26153


Community-CI: Mellanox Build Bot
Reviewed-by: Changpeng Liu <changpeliu@tencent.com>
Reviewed-by: Aleksey Marchuk <alexeymar@nvidia.com>
Tested-by: SPDK Automated Test System <spdkbot@gmail.com>

parent d120447a

mk/spdk.common.mk

+2 −2

Original line number	Diff line number	Diff line
		@@ -168,8 +168,8 @@ endif
		ifeq ($(CONFIG_URING),y)
		SYS_LIBS += -luring
		ifneq ($(strip $(CONFIG_URING_PATH)),)
		CFLAGS += -I$(CONFIG_URING_PATH)
		LDFLAGS += -L$(CONFIG_URING_PATH)
		CFLAGS += -I$(CONFIG_URING_PATH)/include
		LDFLAGS += -L$(CONFIG_URING_PATH)/lib
		endif
		endif

mk/spdk.modules.mk

+0 −5

Original line number	Diff line number	Diff line
		@@ -78,11 +78,6 @@ endif

		ifeq ($(CONFIG_URING),y)
		BLOCKDEV_MODULES_LIST += bdev_uring
		BLOCKDEV_MODULES_PRIVATE_LIBS += -luring
		ifneq ($(strip $(CONFIG_URING_PATH)),)
		CFLAGS += -I$(CONFIG_URING_PATH)
		BLOCKDEV_MODULES_PRIVATE_LIBS += -L$(CONFIG_URING_PATH)
		endif
		endif

		ifeq ($(CONFIG_RBD),y)

module/bdev/uring/Makefile

+0 −6

Original line number	Diff line number	Diff line
		@@ -11,12 +11,6 @@ SO_MINOR := 0

		C_SRCS = bdev_uring.c bdev_uring_rpc.c
		LIBNAME = bdev_uring
		LOCAL_SYS_LIBS = -luring

		ifneq ($(strip $(CONFIG_URING_PATH)),)
		CFLAGS += -I$(CONFIG_URING_PATH)
		LDFLAGS += -L$(CONFIG_URING_PATH)
		endif

		SPDK_MAP_FILE = $(SPDK_ROOT_DIR)/mk/spdk_blank.map