From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org, Peter Maydell <peter.maydell@linaro.org>
Subject: [PULL 03/12] configure: Do not build pc-bios/optionrom on Haiku
Date: Tue, 17 Nov 2020 10:57:39 +0100 [thread overview]
Message-ID: <20201117095748.122371-4-thuth@redhat.com> (raw)
In-Reply-To: <20201117095748.122371-1-thuth@redhat.com>
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 <stefanb@linux.ibm.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
configure | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure b/configure
index a273a93377..c0acda164d 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.
--
2.18.4
next prev parent reply other threads:[~2020-11-17 10:00 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-17 9:57 [PULL 00/12] Misc fixes for 5.2 Thomas Huth
2020-11-17 9:57 ` [PULL 01/12] qemu/bswap: Remove unused qemu_bswap_len() Thomas Huth
2020-11-17 9:57 ` [PULL 02/12] configure: Fix the _BSD_SOURCE define for the Haiku build Thomas Huth
2020-11-17 9:57 ` Thomas Huth [this message]
2020-11-17 9:57 ` [PULL 04/12] configure: Add a proper check for sys/ioccom.h and use it in tpm_ioctl.h Thomas Huth
2020-11-17 9:57 ` [PULL 05/12] tests/vm: Add Haiku test based on their vagrant images Thomas Huth
2020-11-17 9:57 ` [PULL 06/12] tests/vm: update NetBSD to 9.1 Thomas Huth
2020-11-17 9:57 ` [PULL 07/12] target/microblaze: Fix possible array out of bounds in mmu_write() Thomas Huth
2020-11-17 9:57 ` [PULL 08/12] gitlab-ci: Use $CI_REGISTRY instead of hard-coding registry.gitlab.com Thomas Huth
2020-11-17 9:57 ` [PULL 09/12] ssd0323: put it into the 'display' category Thomas Huth
2020-11-17 9:57 ` [PULL 10/12] ads7846: put it into the 'input' category Thomas Huth
2020-11-17 9:57 ` [PULL 11/12] nand: put it into the 'storage' category Thomas Huth
2020-11-17 9:57 ` [PULL 12/12] max111x: put it into the 'misc' category Thomas Huth
2020-11-17 15:09 ` [PULL 00/12] Misc fixes for 5.2 Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201117095748.122371-4-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).