Skip to content

Commit

Permalink
emulators/qemu: Re-enable build for i386
Browse files Browse the repository at this point in the history
During the upgrade to 7.0 the build of qemu for i386 got disabled, due
to "unknown-type name 'vm_page_t'" errors. This has been fixed.

PR:		268647
Reported by:	dim
  • Loading branch information
5u623l20 committed Jan 14, 2023
1 parent 1816757 commit 5fcabb5
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion emulators/qemu/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ WWW= https://www.qemu.org/
LICENSE= GPLv2

.if ${FLAVOR:U} != tools
ONLY_FOR_ARCHS= aarch64 amd64 powerpc64 powerpc64le
ONLY_FOR_ARCHS= aarch64 amd64 i386 powerpc64 powerpc64le
# We need to check if it build with other ARCHS
# For i386 we have unknown type name 'vm_page_t'
.endif
Expand Down
6 changes: 3 additions & 3 deletions emulators/qemu/files/patch-bsd-user_host_i386_host-signal.h
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
--- bsd-user/host/i386/host-signal.h.orig 2022-12-14 16:28:45 UTC
+++ bsd-user/host/i386/host-signal.h
@@ -13,6 +13,7 @@
@@ -12,6 +12,7 @@
#include <sys/param.h>
#include <sys/ucontext.h>
#include <machine/trap.h>
#include <vm/pmap.h>
+#include <vm/vm.h>
#include <vm/pmap.h>
#include <machine/pmap.h>

static inline uintptr_t host_signal_pc(ucontext_t *uc)
4 changes: 2 additions & 2 deletions emulators/qemu/files/patch-meson.build
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- meson.build.orig 2022-04-19 19:10:27 UTC
--- meson.build.orig 2022-12-14 16:28:45 UTC
+++ meson.build
@@ -2505,14 +2505,10 @@ if have_system
@@ -2719,14 +2719,10 @@ if have_system
fdt_opt = get_option('fdt')
if fdt_opt in ['enabled', 'auto', 'system']
have_internal = fs.exists(meson.current_source_dir() / 'dtc/libfdt/Makefile.libfdt')
Expand Down
4 changes: 2 additions & 2 deletions emulators/qemu/files/patch-util_meson.build
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- util/meson.build.orig 2022-04-23 11:59:28 UTC
--- util/meson.build.orig 2022-12-14 16:28:45 UTC
+++ util/meson.build
@@ -87,10 +87,6 @@ if have_block
@@ -97,10 +97,6 @@ if have_block
util_ss.add(files('readline.c'))
util_ss.add(files('throttle.c'))
util_ss.add(files('timed-average.c'))
Expand Down

0 comments on commit 5fcabb5

Please sign in to comment.