Commit 1f5bae84 authored May 10, 2021 by Jim Harris Committed by Tomasz Zawadzki May 11, 2021

build: also look for vfio-user libraries in 'lib'



At least on some Ubuntu distributions, default
vfio-user install puts libs in usr/local/lib instead
of usr/local/lib64.

Signed-off-by: Jim Harris <james.r.harris@intel.com>
Change-Id: Ib312d8ca9b4ce9e858a9a9e76525fc8afd48ced5
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/7825


Community-CI: Mellanox Build Bot
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by:  <dongx.yi@intel.com>

parent a8fe6018

mk/spdk.common.mk

+6 −0

Original line number	Diff line number	Diff line
		@@ -198,6 +198,12 @@ endif
		VFIO_USER_INSTALL_DIR=$(VFIO_USER_DIR)/build
		VFIO_USER_INCLUDE_DIR=$(VFIO_USER_INSTALL_DIR)/usr/local/include
		VFIO_USER_LIBRARY_DIR=$(VFIO_USER_INSTALL_DIR)/usr/local/lib64
		ifeq (,$(wildcard $(VFIO_USER_LIBRARY_DIR)/.))
		# Some Linux distros use lib instead of lib64
		# for default installations
		VFIO_USER_LIBRARY_DIR=$(VFIO_USER_INSTALL_DIR)/usr/local/lib
		endif

		CFLAGS += -I$(VFIO_USER_INCLUDE_DIR)
		LDFLAGS += -L$(VFIO_USER_LIBRARY_DIR)
		SYS_LIBS += -Wl,-Bstatic -lvfio-user -Wl,-Bdynamic -ljson-c

Admin message