[PATCH 1/3] nbdkit: fix build of the SSH plugin on FreeBSD
From: Alan Somers <asomers@gmail.com> There was a missing #include. It only worked on Linux due to header pollution. --- plugins/ssh/ssh.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/ssh/ssh.c b/plugins/ssh/ssh.c index ea199a93..a4007c40 100644 --- a/plugins/ssh/ssh.c +++ b/plugins/ssh/ssh.c @@ -30,6 +30,8 @@ * SUCH DAMAGE. */ +#include <sys/stat.h> + #include <config.h> #include <stdio.h> -- 2.26.2
From: Alan Somers <asomers@gmail.com> It needs the include path for gnutls headers --- plugins/info/Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/info/Makefile.am b/plugins/info/Makefile.am index 7d9accc1..cf483c14 100644 --- a/plugins/info/Makefile.am +++ b/plugins/info/Makefile.am @@ -44,7 +44,9 @@ nbdkit_info_plugin_la_CPPFLAGS = \ -I$(top_srcdir)/include \ -I$(top_srcdir)/common/include \ $(NULL) -nbdkit_info_plugin_la_CFLAGS = $(WARNINGS_CFLAGS) +nbdkit_info_plugin_la_CFLAGS = \ + $(WARNINGS_CFLAGS) \ + $(GNUTLS_CFLAGS) nbdkit_info_plugin_la_LDFLAGS = \ -module -avoid-version -shared $(SHARED_LDFLAGS) \ -Wl,--version-script=$(top_srcdir)/plugins/plugins.syms \ -- 2.26.2
From: Alan Somers <asomers@gmail.com> This can be used to disable the linuxdisk plugin, which otherwise is always built if a suitable mke2fs command is present. --- configure.ac | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index f24c3734..c93e822b 100644 --- a/configure.ac +++ b/configure.ac @@ -483,18 +483,25 @@ AS_IF([test "$GNUTLS_LIBS" != ""],[ LIBS="$old_LIBS" ]) +AC_ARG_WITH([linuxdisk], + [AS_HELP_STRING([--without-linuxdisk], + [disable linuxdisk plugin @<:@default=check@:>@])], + [], + [with_linuxdisk=check]) dnl Check for mke2fs -d (used by linuxdisk plugin). There are two dnl possible outcomes that we care about: (1) We have mke2fs and dnl it supports the -d option. (2) We either don't have mke2fs dnl or it's too old to support the -d option (eg. on RHEL 7). mke2fs_with_d=no -AC_MSG_CHECKING([for mke2fs supporting the -d option]) -AS_IF([mke2fs -V >/dev/null 2>&1], [ - AS_IF([LANG=C mke2fs -d 2>&1 | grep -sq "option requires an argument"], [ - mke2fs_with_d=yes +AS_IF([test "$with_linuxdisk" != "no"], [ + AC_MSG_CHECKING([for mke2fs supporting the -d option]) + AS_IF([mke2fs -V >/dev/null 2>&1], [ + AS_IF([LANG=C mke2fs -d 2>&1 | grep -sq "option requires an argument"], [ + mke2fs_with_d=yes + ]) ]) + AC_MSG_RESULT([$mke2fs_with_d]) ]) -AC_MSG_RESULT([$mke2fs_with_d]) AM_CONDITIONAL([HAVE_MKE2FS_WITH_D],[test "x$mke2fs_with_d" = "xyes"]) dnl Check for valgrind. -- 2.26.2
I made some stylistic changes to the first two patches so they match existing code, and I pushed them, along with your third patch unmodified. Thanks, Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com virt-top is 'top' for virtual machines. Tiny program with many powerful monitoring features, net stats, disk stats, logging, etc. http://people.redhat.com/~rjones/virt-top
Thanks. I didn't realize that #include <config.h> must always come first. I'm used to the FreeBSD convention, where sys/* comes first. -Alan On Fri, Jun 19, 2020 at 8:29 AM Richard W.M. Jones <rjones@redhat.com> wrote:
I made some stylistic changes to the first two patches so they match existing code, and I pushed them, along with your third patch unmodified.
Thanks,
Rich.
-- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com virt-top is 'top' for virtual machines. Tiny program with many powerful monitoring features, net stats, disk stats, logging, etc. http://people.redhat.com/~rjones/virt-top
On Fri, Jun 19, 2020 at 10:44:36AM -0600, alan somers wrote:
Thanks. I didn't realize that #include <config.h> must always come first. I'm used to the FreeBSD convention, where sys/* comes first. -Alan
I believe the actual reason for this (beyond our preferences!) is that config.h, generated by autoconf, can define symbols which affect what is enabled by system headers. The canonical example is _GNU_SOURCE, defined by config.h on Linux, which enables glibc extensions in subsequent header files. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com libguestfs lets you edit virtual machines. Supports shell scripting, bindings from many languages. http://libguestfs.org
On 6/18/20 8:58 PM, asomers@gmail.com wrote:
From: Alan Somers <asomers@gmail.com>
There was a missing #include. It only worked on Linux due to header pollution. --- plugins/ssh/ssh.c | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/plugins/ssh/ssh.c b/plugins/ssh/ssh.c index ea199a93..a4007c40 100644 --- a/plugins/ssh/ssh.c +++ b/plugins/ssh/ssh.c @@ -30,6 +30,8 @@ * SUCH DAMAGE. */
+#include <sys/stat.h> + #include <config.h>
<config.h> must always be first, as there are cases where it sets macros that control how system headers will behave. But I see Rich made that change. -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
participants (4)
-
alan somers -
asomers＠gmail.com
-
Eric Blake -
Richard W.M. Jones