ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Michal Berger 2022-12-09 13:01:44 +01:00 committed by Tomasz Zawadzki
parent 3327bb4391
commit fecffda6ec
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/pkgdep/common.sh
View File

@ -15,7 +15,7 @@ install_liburing() {
fi fi
# Use commit we know we can compile against. See #1673 as a reference. # Use commit we know we can compile against. See #1673 as a reference.
git -C "$liburing_dir" checkout liburing-2.2 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 echo /usr/lib64 > /etc/ld.so.conf.d/spdk-liburing.conf
ldconfig ldconfig
} }

1
xnvmebuild/Makefile
View File

@ -10,6 +10,7 @@ include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
all: all:
(cd $(SPDK_ROOT_DIR)/xnvme && \ (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 setup builddir -Dwith-spdk=false -Dwith-fio=false -Dshared_library=false && \
meson compile -C builddir && \ meson compile -C builddir && \
cd -) cd -)