Commit fecffda6 authored Dec 09, 2022 by Michal Berger Committed by Tomasz Zawadzki Dec 21, 2022

scripts/pkgdep: Install liburing's .pc to known directory



Under fedora, install_liburing() would put .pc under
/usr/lib/pkgconfig, whereas the pkg-config, by default, looks under
/usr/lib64/pkgconfig.

For the tests, make sure both paths are included in the environment
in case any entity (like xnvme) attempts to use pkg-config during
build.

Signed-off-by: Michal Berger <michal.berger@intel.com>
Change-Id: Iab3a4d1f69afc12c56c9fa6b7dd99daaca670e45
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/15853


Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Konrad Sztyber <konrad.sztyber@intel.com>

parent 3327bb43

scripts/pkgdep/common.sh

+1 −1

Original line number	Diff line number	Diff line
		@@ -15,7 +15,7 @@ install_liburing() {
		fi
		# Use commit we know we can compile against. See #1673 as a reference.
		git -C "$liburing_dir" checkout liburing-2.2
		(cd "$liburing_dir" && ./configure --libdir=/usr/lib64 && make install)
		(cd "$liburing_dir" && ./configure --libdir=/usr/lib64 --libdevdir=/usr/lib64 && make install)
		echo /usr/lib64 > /etc/ld.so.conf.d/spdk-liburing.conf
		ldconfig
		}

xnvmebuild/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -10,6 +10,7 @@ include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

		all:
		(cd $(SPDK_ROOT_DIR)/xnvme && \
		export PKG_CONFIG_PATH=$$PKG_CONFIG_PATH:/usr/lib/pkgconfig:/usr/lib64/pkgconfig && \
		meson setup builddir -Dwith-spdk=false -Dwith-fio=false -Dshared_library=false && \
		meson compile -C builddir && \
		cd -)