[PATCH 2/4] configure: Do not build pc-bios/optionrom on Haiku

Thomas Huth posted 4 patches 5 years, 2 months ago
Maintainers: Eric Blake <eblake@redhat.com>, Stefan Berger <stefanb@linux.vnet.ibm.com>
[PATCH 2/4] configure: Do not build pc-bios/optionrom on Haiku
Posted by Thomas Huth 5 years, 2 months ago
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.

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


Re: [PATCH 2/4] configure: Do not build pc-bios/optionrom on Haiku
Posted by Stefan Berger 5 years, 2 months ago
On 11/14/20 11:51 AM, Thomas Huth wrote:
> 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.
>
> 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.

Reviewed-by: Stefan Berger <stefanb@linux.ibm.com>


Re: [PATCH 2/4] configure: Do not build pc-bios/optionrom on Haiku
Posted by Philippe Mathieu-Daudé 5 years, 2 months ago
On 11/14/20 5:51 PM, Thomas Huth wrote:
> 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.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  configure | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>