From 8c54d590cbcad5579548d53499ce0bf501bd56bb Mon Sep 17 00:00:00 2001 From: pkubaj Date: Fri, 5 Aug 2022 12:02:50 +0000 Subject: [PATCH] Fix build on FreeBSD/powerpc* Current error: ld: error: undefined symbol: xf86EnableIO >>> referenced by xf86Configure.c >>> libxorg_common.a.p/xf86Configure.c.o:(DoConfigure) in archive hw/xfree86/common/libxorg_common.a >>> referenced by xf86Events.c >>> libxorg_common.a.p/xf86Events.c.o:(xf86VTEnter) in archive hw/xfree86/common/libxorg_common.a >>> referenced by xf86Init.c >>> libxorg_common.a.p/xf86Init.c.o:(InitOutput) in archive hw/xfree86/common/libxorg_common.a >>> referenced 1 more times --- hw/xfree86/os-support/meson.build | 2 +- meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/xfree86/os-support/meson.build b/hw/xfree86/os-support/meson.build index b6069ee85..64a6c9adb 100644 --- a/hw/xfree86/os-support/meson.build +++ b/hw/xfree86/os-support/meson.build @@ -113,7 +113,7 @@ elif host_machine.system().endswith('bsd') endif elif host_machine.cpu_family() == 'arm' srcs_xorg_os_support += 'bsd/arm_video.c' - elif host_machine.cpu_family() == 'powerpc' + elif host_machine.cpu_family() == 'ppc' or host_machine.cpu_family() == 'ppc64' srcs_xorg_os_support += 'bsd/ppc_video.c' elif host_machine.cpu_family() == 'sparc64' srcs_xorg_os_support += 'bsd/sparc64_video.c' diff --git a/meson.build b/meson.build index 47ecb06c9..ff5d27196 100644 --- a/meson.build +++ b/meson.build @@ -283,7 +283,7 @@ endif int10 = get_option('int10') if int10 == 'auto' int10 = 'x86emu' - if host_machine.cpu() == 'powerpc' and host_machine.system() == 'freebsd' + if host_machine.cpu() == 'ppc' and host_machine.system() == 'freebsd' int10 = 'stub' endif if host_machine.cpu() == 'arm'