| Message ID | CA+XhMqwft10MnY5nOc7L+q59kOY3BAejjrOS09R5QD2H7AH-Cg@mail.gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/5] haiku build fix | expand |
On Fri, 26 Jun 2020 at 11:10, David CARLIER <devnexen@gmail.com> wrote: > > From 68d4d4312eccd212b4d2484e09425816ebd2346a Mon Sep 17 00:00:00 2001 > From: David Carlier <devnexen@gmail.com> > Date: Fri, 26 Jun 2020 11:01:54 +0000 > Subject: [PATCH 5/5] Last chunk of build fix > > Signed-off-by: David Carlier <devnexen@gmail.com> > --- > include/qemu/bswap.h | 2 ++ > util/Makefile.objs | 2 +- > util/compatfd.c | 2 ++ > 3 files changed, 5 insertions(+), 1 deletion(-) These changes are all good, but they're all fixing different things, so they should be separate patches (with commit messages describing what they're doing/why). thanks -- PMM
On 26/06/2020 12.07, David CARLIER wrote: > From 68d4d4312eccd212b4d2484e09425816ebd2346a Mon Sep 17 00:00:00 2001 > From: David Carlier <devnexen@gmail.com> > Date: Fri, 26 Jun 2020 11:01:54 +0000 > Subject: [PATCH 5/5] Last chunk of build fix > > Signed-off-by: David Carlier <devnexen@gmail.com> > --- > include/qemu/bswap.h | 2 ++ > util/Makefile.objs | 2 +- > util/compatfd.c | 2 ++ > 3 files changed, 5 insertions(+), 1 deletion(-) Hi David, not directly related to this patch, but: do you know whether Haiku can also be installed non-interactively? We've got a set of VM-based compilation tests for FreeBSD, NetBSD and OpenBSD, see tests/vm/ in the QEMU sources (or run "make vm-help" for more information about the make targets) ... if something similar would be possible for Haiku, that would certainly help to prevent that the Haiku port bitrots so easily again... Thomas
diff --git a/include/qemu/bswap.h b/include/qemu/bswap.h index 2a9f3fe783..1d3e4c24e4 100644 --- a/include/qemu/bswap.h +++ b/include/qemu/bswap.h @@ -8,6 +8,8 @@ # include <machine/bswap.h> #elif defined(__FreeBSD__) # include <sys/endian.h> +#elif defined(__HAIKU__) +# include <endian.h> #elif defined(CONFIG_BYTESWAP_H) # include <byteswap.h> diff --git a/util/Makefile.objs b/util/Makefile.objs index cc5e37177a..faebc13fac 100644 --- a/util/Makefile.objs +++ b/util/Makefile.objs @@ -39,7 +39,7 @@ util-obj-y += qsp.o util-obj-y += range.o util-obj-y += stats64.o util-obj-y += systemd.o -util-obj-$(CONFIG_POSIX) += drm.o +util-obj-$(CONFIG_LINUX) += drm.o util-obj-y += guest-random.o util-obj-$(CONFIG_GIO) += dbus.o dbus.o-cflags = $(GIO_CFLAGS) diff --git a/util/compatfd.c b/util/compatfd.c index c296f55d14..ee47dd8089 100644 --- a/util/compatfd.c +++ b/util/compatfd.c @@ -16,7 +16,9 @@ #include "qemu/osdep.h" #include "qemu/thread.h" +#if defined(CONFIG_SIGNALFD) #include <sys/syscall.h> +#endif struct sigfd_compat_info {