From cde992536270b0a77b4a80bb435bdddb64e3b308 Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Sat, 14 Nov 2020 09:51:22 +0100 Subject: configure: Fix the _BSD_SOURCE define for the Haiku build The Haiku VM that we are going to add is using _BSD_SOURCE instead of BSD_SOURCE (without initial underscore)... according to David Carlier, the BSD_SOURCE without underscore was likely a typo, so let's simply add the underscore there now. This fixes the build failure with the bswapXX() macros not being defined after including . Message-Id: <20201114165137.15379-2-thuth@redhat.com> Reviewed-by: Stefan Berger --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure') diff --git a/configure b/configure index 4cef321..a273a93 100755 --- a/configure +++ b/configure @@ -790,7 +790,7 @@ SunOS) ;; Haiku) haiku="yes" - QEMU_CFLAGS="-DB_USE_POSITIVE_POSIX_ERRORS -DBSD_SOURCE $QEMU_CFLAGS" + QEMU_CFLAGS="-DB_USE_POSITIVE_POSIX_ERRORS -D_BSD_SOURCE $QEMU_CFLAGS" ;; Linux) audio_drv_list="try-pa oss" -- cgit v1.1 From 7000a12e08f42e12c4422ffc3c15e541fc2bfce1 Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Sat, 14 Nov 2020 10:49:31 +0100 Subject: configure: Do not build pc-bios/optionrom on Haiku MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Compilation of pc-bios/optionrom fails on Haiku with: BUILD pvh.img ld: pvh_main.o: in function `pvh_load_kernel': pc-bios/optionrom/pvh_main.c:73: undefined reference to `GLOBAL_OFFSET_TABLE_' Makefile:57: recipe for target 'pvh.img' failed make[1]: *** [pvh.img] Error 1 Let's simply disable it, like it is already done on macOS and Solaris. Message-Id: <20201114165137.15379-3-thuth@redhat.com> Reviewed-by: Stefan Berger Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Thomas Huth --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure') diff --git a/configure b/configure index a273a93..c0acda1 100755 --- a/configure +++ b/configure @@ -5842,7 +5842,7 @@ fi roms= if { test "$cpu" = "i386" || test "$cpu" = "x86_64"; } && \ test "$targetos" != "Darwin" && test "$targetos" != "SunOS" && \ - test "$softmmu" = yes ; then + test "$targetos" != "Haiku" && test "$softmmu" = yes ; then # Different host OS linkers have different ideas about the name of the ELF # emulation. Linux and OpenBSD/amd64 use 'elf_i386'; FreeBSD uses the _fbsd # variant; OpenBSD/i386 uses the _obsd variant; and Windows uses i386pe. -- cgit v1.1