blob: 0acbada2479d702b6fa567fc1b7668db954a655c (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
|
From 00ae82a00981d57747eed74e619cba03d5edb7d9 Mon Sep 17 00:00:00 2001
Message-ID: <00ae82a00981d57747eed74e619cba03d5edb7d9.1791657875.git.sam@gentoo.org>
From: Sam James <sam@gentoo.org>
Date: Sat, 10 Oct 2026 19:43:34 +0100
Subject: [PATCH xserver] Revert "meson: check cpu_family() instead of cpu()"
This reverts commit 5981d49e9a26d5401d80f3ef591033cc5faa7e05.
Hack to restore the old, broken-but-builds way of doing things on arm
until it is handled upstream.
Bug: https://gitlab.freedesktop.org/xorg/xserver/-/work_items/1929
Bug: https://bugs.gentoo.org/984048
---
hw/xfree86/int10/meson.build | 2 +-
meson.build | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/hw/xfree86/int10/meson.build b/hw/xfree86/int10/meson.build
index ac47baa65..a309e9b53 100644
--- a/hw/xfree86/int10/meson.build
+++ b/hw/xfree86/int10/meson.build
@@ -10,7 +10,7 @@ srcs_xorg_int10 = [
int10_c_args = [xorg_c_args]
int10_link = []
-if host_machine.cpu_family() == 'i386' or host_machine.cpu_family() == 'x86_64'
+if host_machine.cpu() == 'i386' or host_machine.cpu() == 'x86_64'
int10_c_args += '-D_PC'
endif
diff --git a/meson.build b/meson.build
index 43c5a8d75..591b3a341 100644
--- a/meson.build
+++ b/meson.build
@@ -249,10 +249,10 @@ endif
int10 = get_option('int10')
if int10 == 'auto'
int10 = 'x86emu'
- if host_machine.cpu_family() == 'ppc' and host_machine.system() == 'freebsd'
+ if host_machine.cpu() == 'ppc' and host_machine.system() == 'freebsd'
int10 = 'stub'
endif
- if host_machine.cpu_family() == 'arm'
+ if host_machine.cpu() == 'arm'
int10 = 'stub'
endif
endif
@@ -503,9 +503,9 @@ endif
build_acpi = false
if (get_option('linux_acpi') == true and
host_machine.system() == 'linux')
- if (host_machine.cpu_family() == 'x86' or
- host_machine.cpu_family() == 'x86_64' or
- host_machine.cpu_family() == 'ia64')
+ if (host_machine.cpu() == 'x86' or
+ host_machine.cpu() == 'x86_64' or
+ host_machine.cpu() == 'ia64')
build_acpi = true
endif
endif
--
2.56.0
|
