From: Tokunori Ikegami <ikegami.t@gmail.com>
Date: Thu, 16 Nov 2023 16:42:00 +0000 (+0100)
Subject: build: remove the wrap feature dependency for muon
X-Git-Tag: v2.7~46
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=8f18d409f6320301f6a8b77c9d0e3d54914b9dc0;p=users%2Fsagi%2Fnvme-cli.git

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 <ikegami.t@gmail.com>
[dwagner: updated commit message]
Signed-off-by: Daniel Wagner <dwagner@suse.de>
---

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                        \