Eric Blake
2022-Oct-20 20:32 UTC
[Libguestfs] [nbdkit PATCH 06/10] build: Only attempt to build vddk on Linux
When --enable/disable-vddk is not given to configure, our default was
to base on the current architecture. But we know that we are
targeting a .so library built for Linux, so we can also gate things
based on the host OS. And doing so means that vddk is no longer even
attempted on mingw, eliminating the need to explicitly enable/disable
it in our CI recipes.
---
configure.ac | 6 +++---
ci/build.sh | 2 --
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/configure.ac b/configure.ac
index d506fb51..000a7d67 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1302,11 +1302,11 @@ AC_ARG_ENABLE([vddk],
dnl newer versions which are supported only on x86-64. Don't
dnl compile on other platforms.
AC_MSG_CHECKING([if the host CPU is compatible with VDDK])
- AS_IF([test "$host_cpu" = "x86_64"],[
- AC_MSG_RESULT([yes ($host_cpu)])
+ AS_IF([test "$host_cpu" = "x86_64" && test
"$host_os" = "linux-gnu"],[
+ AC_MSG_RESULT([yes ($host)])
enable_vddk=yes
],[
- AC_MSG_RESULT([no ($host_cpu)])
+ AC_MSG_RESULT([no ($host)])
enable_vddk=no
])
])
diff --git a/ci/build.sh b/ci/build.sh
index 7d31d5c5..241d0ef5 100755
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -122,14 +122,12 @@ main() {
CONFIG_ARGS="\
$CONFIG_ARGS
--disable-ocaml
---disable-vddk
"
;;
*)
CONFIG_ARGS="\
$CONFIG_ARGS
--enable-ocaml
---enable-vddk
"
;;
esac
--
2.37.3
Richard W.M. Jones
2022-Oct-20 22:09 UTC
[Libguestfs] [nbdkit PATCH 06/10] build: Only attempt to build vddk on Linux
On Thu, Oct 20, 2022 at 03:32:05PM -0500, Eric Blake wrote:> When --enable/disable-vddk is not given to configure, our default was > to base on the current architecture. But we know that we are > targeting a .so library built for Linux, so we can also gate things > based on the host OS. And doing so means that vddk is no longer even > attempted on mingw, eliminating the need to explicitly enable/disable > it in our CI recipes.It would theoretically be possible to get VDDK to work for the Windows port. (In fact I believe someone asked for this). However at the moment it's Linux only so this is fine. Rich.> configure.ac | 6 +++--- > ci/build.sh | 2 -- > 2 files changed, 3 insertions(+), 5 deletions(-) > > diff --git a/configure.ac b/configure.ac > index d506fb51..000a7d67 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -1302,11 +1302,11 @@ AC_ARG_ENABLE([vddk], > dnl newer versions which are supported only on x86-64. Don't > dnl compile on other platforms. > AC_MSG_CHECKING([if the host CPU is compatible with VDDK]) > - AS_IF([test "$host_cpu" = "x86_64"],[ > - AC_MSG_RESULT([yes ($host_cpu)]) > + AS_IF([test "$host_cpu" = "x86_64" && test "$host_os" = "linux-gnu"],[ > + AC_MSG_RESULT([yes ($host)]) > enable_vddk=yes > ],[ > - AC_MSG_RESULT([no ($host_cpu)]) > + AC_MSG_RESULT([no ($host)]) > enable_vddk=no > ]) > ]) > diff --git a/ci/build.sh b/ci/build.sh > index 7d31d5c5..241d0ef5 100755 > --- a/ci/build.sh > +++ b/ci/build.sh > @@ -122,14 +122,12 @@ main() { > CONFIG_ARGS="\ > $CONFIG_ARGS > --disable-ocaml > ---disable-vddk > " > ;; > *) > CONFIG_ARGS="\ > $CONFIG_ARGS > --enable-ocaml > ---enable-vddk > " > ;; > esac > -- > 2.37.3 > > _______________________________________________ > Libguestfs mailing list > Libguestfs at redhat.com > https://listman.redhat.com/mailman/listinfo/libguestfs-- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com nbdkit - Flexible, fast NBD server with plugins https://gitlab.com/nbdkit/nbdkit