From 8f18d409f6320301f6a8b77c9d0e3d54914b9dc0 Mon Sep 17 00:00:00 2001 From: Tokunori Ikegami Date: Thu, 16 Nov 2023 17:42:00 +0100 Subject: [PATCH] build: remove the wrap feature dependency for muon The libnvme.wrap is using a git URL for libnvme thus it doesn't depend on libcurl, libarchive or libpkgconf. The wrap implementation is calling git directly to download the library. Thus we can drop these dependency which makes it possible to build it on older distributions such as CentOS 7 and 8. Signed-off-by: Tokunori Ikegami [dwagner: updated commit message] Signed-off-by: Daniel Wagner --- scripts/build.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/build.sh b/scripts/build.sh index c20a004a..a9cb0af4 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -167,9 +167,6 @@ tools_build_muon() { CC="${CC}" ninja="${SAMU}" stage1/muon setup \ -Dprefix="${TOOLDIR}" \ - -Dlibcurl=enabled \ - -Dlibarchive=enabled \ - -Dlibpkgconf=enabled \ -Ddocs=disabled \ -Dsamurai=disabled \ "${TOOLDIR}/build-muon" @@ -183,6 +180,8 @@ tools_build_muon() { } config_muon_default() { + # wrap_mode=forcefallback depends on git being available + CC="${CC}" CFLAGS="${CFLAGS}" ninja="${SAMU}" \ "${MUON}" setup \ -Ddefault_library=static \ -- 2.50.1