]> www.infradead.org Git - users/sagi/nvme-cli.git/commitdiff
build: remove the wrap feature dependency for muon
authorTokunori Ikegami <ikegami.t@gmail.com>
Thu, 16 Nov 2023 16:42:00 +0000 (17:42 +0100)
committerDaniel Wagner <wagi@monom.org>
Thu, 16 Nov 2023 16:56:07 +0000 (17:56 +0100)
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>
scripts/build.sh

index c20a004a597a8c87541d94f6183b52cf9e1473f8..a9cb0af4e80c49121dea43a5c34b7f458974a53e 100755 (executable)
@@ -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                        \