XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-03-24 10:14:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

xfree86: fix meson build on 64-bit Solaris/SPARC systems

Browse Source 
For cpu_family(), meson returns "sparc" for 32-bit sparc,
and "sparc64" for 64-bit sparc, regardless of the OS in use.

For cpu(), meson returns values like "sun4v" on Solaris/SPARC,
and doesn't promise stability of the values, or portability across
OS'es, unlike cpu_family().

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2070>
This commit is contained in:
Alan Coopersmith
2025-10-21 12:18:29 +03:00
committed by Enrico Weigelt
parent 6f3a4caf97
commit 68cb3407d5
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hw/xfree86/common/meson.build
View File

@@ -70,7 +70,7 @@ endif
if get_option('pciaccess')
srcs_xorg_common += ['xf86pciBus.c', 'xf86VGAarbiter.c']
if host_machine.cpu() == 'sparc' or host_machine.cpu() == 'sparc64'
if host_machine.cpu_family() in ['sparc', 'sparc64']
srcs_xorg_common += 'xf86sbusBus.c'
endif
endif

4
hw/xfree86/os-support/meson.build
View File

@@ -16,7 +16,7 @@ os_c_args = []
if get_option('pciaccess')
srcs_xorg_os_support += 'bus/Pci.c'
if host_machine.cpu() == 'sparc' or host_machine.cpu() == 'sparc64'
if host_machine.cpu_family() in ['sparc', 'sparc64']
srcs_xorg_os_support += 'bus/Sbus.c'
install_data('bus/xf86Sbus.h', install_dir: xorgsdkdir)
endif
@@ -82,7 +82,7 @@ elif host_machine.system() == 'sunos'
srcs_xorg_os_support += 'shared/agp_noop.c'
endif
if host_machine.cpu_family() == 'sparc'
if host_machine.cpu_family() in ['sparc', 'sparc64']
srcs_xorg_os_support += 'solaris/solaris-sparcv8plus.S'
elif host_machine.cpu_family() == 'x86_64'
srcs_xorg_os_support += 'solaris/solaris-amd64.S'