Commit 9d1e4260 authored Aug 14, 2019 by Seth Howell Committed by Jim Harris Aug 15, 2019

mk: move log_rpc from inside log



The log_rpc library has several dependencies which depend upon the log
library. This creates a circular dependency chain that makes single
threaded make unwieldy and makes multi-threaded make impossible.

Change-Id: I35e6532afcabce0f25974ed97444a56975654904
Signed-off-by: Seth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/465192


Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>

parent 2a3b6b41

lib/Makefile

+2 −2

Original line number	Diff line number	Diff line
		@@ -35,8 +35,8 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/..)
		include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

		DIRS-y += bdev blob blobfs conf copy event json jsonrpc \
		log lvol net rpc sock thread trace util nvme vmd nvmf scsi ioat \
		ut_mock iscsi notify
		log log_rpc lvol net rpc sock thread trace util nvme vmd nvmf scsi \
		ioat ut_mock iscsi notify
		ifeq ($(OS),Linux)
		DIRS-y += nbd ftl
		endif

lib/log/Makefile

+0 −2

Original line number	Diff line number	Diff line
		@@ -40,6 +40,4 @@ ifeq ($(CONFIG_LOG_BACKTRACE),y)
		LOCAL_SYS_LIBS += -lunwind
		endif

		DIRS-y = rpc

		include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk

lib/log/rpc/Makefile→lib/log_rpc/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -31,7 +31,7 @@
		# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
		#

		SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
		SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
		include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

		C_SRCS = log_rpc.c

lib/log/rpc/log_rpc.c→lib/log_rpc/log_rpc.c

+0 −0

File moved.