Commit 927f1fd5 authored by John Levon's avatar John Levon Committed by Tomasz Zawadzki
Browse files

libvfio-user: update to use meson 



libvfio-user has switched from cmake to meson; update the submodule for
this, and switch over to building with meson.

Signed-off-by: default avatarJohn Levon <john.levon@nutanix.com>
Change-Id: Ia0749590271d0b74260c9118692c21e2a82dde23
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/12640


Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent e0516095

configure

+0 −5
Original line number Diff line number Diff line
@@ -656,11 +656,6 @@ BUILD_CMD+=(-I/usr/local/include -L/usr/local/lib) 


if [[ "${CONFIG[VFIO_USER]}" = "y" ]]; then



	if ! bash -c "command -v cmake3 cmake" > /dev/null; then

		echo "ERROR: --with-vfio-user requires cmake"

		echo "Please install then re-run this script"

		exit 1

	fi

	if [[ ! -d /usr/include/json-c ]] && [[ ! -d /usr/local/include/json-c ]]; then

		echo "ERROR: --with-vfio-user requires json-c-devel"

		echo "Please install then re-run this script"

libvfio-user @ b427c608

Compare bc44bd1a to b427c608
Original line number Diff line number Diff line 
Subproject commit bc44bd1a246dc95b91faae30defafc3c259f5c4d
 
Subproject commit b427c6084311f0c620bf4afe7746739e8c887977

mk/spdk.common.mk

+7 −10
Original line number Diff line number Diff line
@@ -186,23 +186,20 @@ endif 


ifeq ($(CONFIG_VFIO_USER), y)

ifneq ($(CONFIG_VFIO_USER_DIR),)

VFIO_USER_DIR=$(CONFIG_VFIO_USER_DIR)

VFIO_USER_SRC_DIR=$(CONFIG_VFIO_USER_DIR)

else

VFIO_USER_DIR=$(SPDK_ROOT_DIR)/libvfio-user

VFIO_USER_SRC_DIR=$(SPDK_ROOT_DIR)/libvfio-user

endif

ifeq ($(CONFIG_DEBUG), y)

VFIO_USER_BUILD_TYPE=dbg

VFIO_USER_BUILD_TYPE=debug

else

VFIO_USER_BUILD_TYPE=release

endif

VFIO_USER_INSTALL_DIR=$(VFIO_USER_DIR)/build

VFIO_USER_LIB_PREFIX=/usr/local/lib

VFIO_USER_BUILD_DIR=$(SPDK_ROOT_DIR)/build/libvfio-user/build-$(VFIO_USER_BUILD_TYPE)

VFIO_USER_INSTALL_DIR=$(SPDK_ROOT_DIR)/build/libvfio-user/

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

VFIO_USER_LIBRARY_DIR=$(VFIO_USER_INSTALL_DIR)/$(VFIO_USER_LIB_PREFIX)



CFLAGS += -I$(VFIO_USER_INCLUDE_DIR)

LDFLAGS += -L$(VFIO_USER_LIBRARY_DIR)

scripts/pkgdep/arch.sh

+1 −1
Original line number Diff line number Diff line 
#!/usr/bin/env bash



# Install main dependencies

pacman -Sy --needed --noconfirm gcc make cmake cunit libaio openssl \

pacman -Sy --needed --noconfirm gcc make cunit libaio openssl \

	libutil-linux libiscsi python ncurses json-c cmocka ninja meson

# Additional dependencies for SPDK CLI

pacman -Sy --needed --noconfirm python-pexpect python-pip libffi

scripts/pkgdep/clear-linux-os.sh

+1 −1
Original line number Diff line number Diff line 
#!/usr/bin/env bash



# Install main dependencies

swupd bundle-add -y c-basic make cmake dev-utils openssl devpkg-libiscsi \

swupd bundle-add -y c-basic make dev-utils openssl devpkg-libiscsi \

	devpkg-ncurses python3-basic python-extras devpkg-open-iscsi devpkg-json-c \

	storage-utils

# Additional dependencies for ISA-L used in compression