Commit b1d3b8c0 authored by Michal Berger's avatar Michal Berger Committed by Tomasz Zawadzki
Browse files

pkgdep/git: Build json-c from nvme-cli's subproject



The nvmecli_plugin ref is based on an older nvme-cli version (2.4),
which does not include several refactors|fixes targeted for the
json print lib. Without these changes, this particular version
of nvme-cli cannot be compiled under distros which don't provide
json-c lib at a expected version (>= 0.13) - this is the case
for centos7 for instance.

To mitigate that, make sure that json-c is built from the nvme-cli's
subproject to provide proper support under less up-to-date distros.

Change-Id: Ida815ba63266c954020bedb7bc7662fc67255f2c
Signed-off-by: default avatarMichal Berger <michal.berger@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/20379


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarJim Harris <jim.harris@samsung.com>
parent 07034ca3
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ function install_nvmecli_plugin() {
	git -C "$GIT_REPOS/nvme-cli-plugin" fetch $GIT_REPO_NVME_CLI refs/changes/95/16795/12
	git -C "$GIT_REPOS/nvme-cli-plugin" checkout FETCH_HEAD

	meson setup --force-fallback-for=libnvme \
	meson setup --force-fallback-for=libnvme,json-c \
		"$GIT_REPOS/nvme-cli-plugin/.build" \
		"$GIT_REPOS/nvme-cli-plugin"
	meson compile -C "$GIT_REPOS/nvme-cli-plugin/.build"