1 |
commit: 320efbeeab0c2dd27f151313782f35aa3e4e2b54 |
2 |
Author: John Helmert III <ajak <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jan 1 09:40:39 2022 +0000 |
4 |
Commit: John Helmert III <ajak <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jan 1 09:41:49 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=320efbee |
7 |
|
8 |
app-emulation/qemu: sync live |
9 |
|
10 |
Signed-off-by: John Helmert III <ajak <AT> gentoo.org> |
11 |
|
12 |
app-emulation/qemu/qemu-9999.ebuild | 49 +++++++++++++++++++++++++------------ |
13 |
1 file changed, 33 insertions(+), 16 deletions(-) |
14 |
|
15 |
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild |
16 |
index c15115e71a39..e84304a7ae78 100644 |
17 |
--- a/app-emulation/qemu/qemu-9999.ebuild |
18 |
+++ b/app-emulation/qemu/qemu-9999.ebuild |
19 |
@@ -1,12 +1,12 @@ |
20 |
-# Copyright 1999-2021 Gentoo Authors |
21 |
+# Copyright 1999-2022 Gentoo Authors |
22 |
# Distributed under the terms of the GNU General Public License v2 |
23 |
|
24 |
-EAPI="7" |
25 |
+EAPI=8 |
26 |
|
27 |
-PYTHON_COMPAT=( python3_{7,8,9,10} ) |
28 |
+PYTHON_COMPAT=( python3_{8,9,10} ) |
29 |
PYTHON_REQ_USE="ncurses,readline" |
30 |
|
31 |
-FIRMWARE_ABI_VERSION="6.1.0" |
32 |
+FIRMWARE_ABI_VERSION="6.2.0" |
33 |
|
34 |
inherit linux-info toolchain-funcs python-r1 udev fcaps readme.gentoo-r1 \ |
35 |
pax-utils xdg-utils |
36 |
@@ -32,11 +32,11 @@ HOMEPAGE="https://www.qemu.org https://www.linux-kvm.org" |
37 |
LICENSE="GPL-2 LGPL-2 BSD-2" |
38 |
SLOT="0" |
39 |
|
40 |
-IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug +doc |
41 |
+IUSE="accessibility +aio alsa bpf bzip2 capstone +caps +curl debug +doc |
42 |
+fdt fuse glusterfs gnutls gtk infiniband iscsi io-uring |
43 |
jack jemalloc +jpeg kernel_linux |
44 |
kernel_FreeBSD lzo multipath |
45 |
- ncurses nfs nls numa opengl +oss +pin-upstream-blobs |
46 |
+ ncurses nfs nls numa opengl +oss pam +pin-upstream-blobs |
47 |
plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux |
48 |
+slirp |
49 |
smartcard snappy spice ssh static static-user systemtap test udev usb |
50 |
@@ -105,6 +105,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} |
51 |
qemu_softmmu_targets_ppc? ( fdt ) |
52 |
qemu_softmmu_targets_riscv32? ( fdt ) |
53 |
qemu_softmmu_targets_riscv64? ( fdt ) |
54 |
+ qemu_softmmu_targets_x86_64? ( fdt ) |
55 |
sdl-image? ( sdl ) |
56 |
static? ( static-user !alsa !gtk !jack !opengl !pulseaudio !plugins !rbd !snappy !udev ) |
57 |
static-user? ( !plugins ) |
58 |
@@ -142,6 +143,7 @@ SOFTMMU_TOOLS_DEPEND=" |
59 |
) |
60 |
aio? ( dev-libs/libaio[static-libs(+)] ) |
61 |
alsa? ( >=media-libs/alsa-lib-1.0.13 ) |
62 |
+ bpf? ( dev-libs/libbpf:= ) |
63 |
bzip2? ( app-arch/bzip2[static-libs(+)] ) |
64 |
capstone? ( dev-libs/capstone:= ) |
65 |
caps? ( sys-libs/libcap-ng[static-libs(+)] ) |
66 |
@@ -157,11 +159,7 @@ SOFTMMU_TOOLS_DEPEND=" |
67 |
x11-libs/gtk+:3 |
68 |
vte? ( x11-libs/vte:2.91 ) |
69 |
) |
70 |
- infiniband? ( |
71 |
- sys-fabric/libibumad:=[static-libs(+)] |
72 |
- sys-fabric/libibverbs:=[static-libs(+)] |
73 |
- sys-fabric/librdmacm:=[static-libs(+)] |
74 |
- ) |
75 |
+ infiniband? ( sys-cluster/rdma-core[static-libs(+)] ) |
76 |
iscsi? ( net-libs/libiscsi ) |
77 |
io-uring? ( sys-libs/liburing:=[static-libs(+)] ) |
78 |
jack? ( virtual/jack ) |
79 |
@@ -181,6 +179,7 @@ SOFTMMU_TOOLS_DEPEND=" |
80 |
media-libs/mesa[static-libs(+)] |
81 |
media-libs/mesa[egl(+),gbm(+)] |
82 |
) |
83 |
+ pam? ( sys-libs/pam ) |
84 |
png? ( media-libs/libpng:0=[static-libs(+)] ) |
85 |
pulseaudio? ( media-sound/pulseaudio ) |
86 |
rbd? ( sys-cluster/ceph ) |
87 |
@@ -241,8 +240,8 @@ BDEPEND=" |
88 |
sys-apps/texinfo |
89 |
virtual/pkgconfig |
90 |
doc? ( |
91 |
- dev-python/sphinx |
92 |
- dev-python/sphinx_rtd_theme |
93 |
+ dev-python/sphinx[${PYTHON_USEDEP}] |
94 |
+ dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] |
95 |
) |
96 |
gtk? ( nls? ( sys-devel/gettext ) ) |
97 |
test? ( |
98 |
@@ -269,7 +268,10 @@ DEPEND="${CDEPEND} |
99 |
static-user? ( ${ALL_DEPEND} )" |
100 |
RDEPEND="${CDEPEND} |
101 |
acct-group/kvm |
102 |
- selinux? ( sec-policy/selinux-qemu )" |
103 |
+ selinux? ( |
104 |
+ sec-policy/selinux-qemu |
105 |
+ sys-libs/libselinux |
106 |
+ )" |
107 |
|
108 |
PATCHES=( |
109 |
"${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch |
110 |
@@ -445,6 +447,7 @@ qemu_src_configure() { |
111 |
--disable-containers # bug #732972 |
112 |
--disable-guest-agent |
113 |
--disable-strip |
114 |
+ --with-git-submodules=ignore |
115 |
|
116 |
# bug #746752: TCG interpreter has a few limitations: |
117 |
# - it does not support FPU |
118 |
@@ -465,11 +468,17 @@ qemu_src_configure() { |
119 |
--cc="$(tc-getCC)" |
120 |
--cxx="$(tc-getCXX)" |
121 |
--host-cc="$(tc-getBUILD_CC)" |
122 |
+ $(use_enable alsa) |
123 |
$(use_enable debug debug-info) |
124 |
$(use_enable debug debug-tcg) |
125 |
$(use_enable doc docs) |
126 |
+ $(use_enable jack) |
127 |
$(use_enable nls gettext) |
128 |
+ $(use_enable oss) |
129 |
+ $(use_enable pam auth-pam) |
130 |
$(use_enable plugins) |
131 |
+ $(use_enable pulseaudio pa) |
132 |
+ $(use_enable selinux) |
133 |
$(use_enable xattr attr) |
134 |
) |
135 |
|
136 |
@@ -498,9 +507,17 @@ qemu_src_configure() { |
137 |
echo "--disable-${2:-$1}" |
138 |
fi |
139 |
} |
140 |
+ # Special case for the malloc flag, because the --disable flag does |
141 |
+ # not exist and trying like above will break configuring. |
142 |
+ conf_malloc() { |
143 |
+ if [[ ! ${buildtype} == "user" ]] ; then |
144 |
+ usex "${1}" "--enable-malloc=${1}" "" |
145 |
+ fi |
146 |
+ } |
147 |
conf_opts+=( |
148 |
$(conf_notuser accessibility brlapi) |
149 |
$(conf_notuser aio linux-aio) |
150 |
+ $(conf_softmmu bpf) |
151 |
$(conf_notuser bzip2) |
152 |
$(conf_notuser capstone) |
153 |
$(conf_notuser caps cap-ng) |
154 |
@@ -514,7 +531,7 @@ qemu_src_configure() { |
155 |
$(conf_notuser infiniband rdma) |
156 |
$(conf_notuser iscsi libiscsi) |
157 |
$(conf_notuser io-uring linux-io-uring) |
158 |
- $(conf_notuser jemalloc jemalloc) |
159 |
+ $(conf_malloc jemalloc) |
160 |
$(conf_notuser jpeg vnc-jpeg) |
161 |
$(conf_notuser kernel_linux kvm) |
162 |
$(conf_notuser lzo) |
163 |
@@ -571,7 +588,7 @@ qemu_src_configure() { |
164 |
$(usev oss) |
165 |
) |
166 |
conf_opts+=( |
167 |
- --audio-drv-list=$(printf "%s," "${audio_opts[@]}") |
168 |
+ --audio-drv-list=$(IFS=,; echo "${audio_opts[*]}") |
169 |
) |
170 |
fi |