From fecffda6ecf8853b82edccde429b68252f0a62c5 Mon Sep 17 00:00:00 2001 From: Michal Berger Date: Fri, 9 Dec 2022 13:01:44 +0100 Subject: [PATCH] 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 Change-Id: Iab3a4d1f69afc12c56c9fa6b7dd99daaca670e45 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/15853 Tested-by: SPDK CI Jenkins Community-CI: Mellanox Build Bot Reviewed-by: Jim Harris Reviewed-by: Konrad Sztyber --- scripts/pkgdep/common.sh | 2 +- xnvmebuild/Makefile | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/pkgdep/common.sh b/scripts/pkgdep/common.sh index a2c197f7e..4f7700904 100755 --- a/scripts/pkgdep/common.sh +++ b/scripts/pkgdep/common.sh @@ -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 } diff --git a/xnvmebuild/Makefile b/xnvmebuild/Makefile index a4f079b91..60b8279ff 100644 --- a/xnvmebuild/Makefile +++ b/xnvmebuild/Makefile @@ -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 -)