1 |
commit: 40af7d7d939b17bf775e41807b2d7f85db48af6e |
2 |
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Mar 9 18:41:23 2017 +0000 |
4 |
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Mar 9 18:48:47 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40af7d7d |
7 |
|
8 |
app-emulation/qemu: update live-ebuild |
9 |
|
10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.2 |
11 |
|
12 |
app-emulation/qemu/qemu-9999.ebuild | 115 ++++++++++++++++++------------------ |
13 |
1 file changed, 59 insertions(+), 56 deletions(-) |
14 |
|
15 |
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild |
16 |
index 46221a38b07..5e9a34ada3b 100644 |
17 |
--- a/app-emulation/qemu/qemu-9999.ebuild |
18 |
+++ b/app-emulation/qemu/qemu-9999.ebuild |
19 |
@@ -389,58 +389,71 @@ qemu_src_configure() { |
20 |
$(use_enable xattr attr) |
21 |
) |
22 |
|
23 |
- # Disable options not used by user targets as the default configure |
24 |
- # options will autoprobe and try to link in a bunch of unused junk. |
25 |
- conf_softmmu() { |
26 |
- if [[ ${buildtype} == "softmmu" ]] ; then |
27 |
- use_enable "$@" |
28 |
- else |
29 |
+ # Disable options not used by user targets. This simplifies building |
30 |
+ # static user targets (USE=static-user) considerably. |
31 |
+ conf_notuser() { |
32 |
+ if [[ ${buildtype} == "user" ]] ; then |
33 |
echo "--disable-${2:-$1}" |
34 |
+ else |
35 |
+ use_enable "$@" |
36 |
fi |
37 |
} |
38 |
conf_opts+=( |
39 |
- $(conf_softmmu accessibility brlapi) |
40 |
- $(conf_softmmu aio linux-aio) |
41 |
- $(conf_softmmu bzip2) |
42 |
- $(conf_softmmu bluetooth bluez) |
43 |
- $(conf_softmmu caps cap-ng) |
44 |
- $(conf_softmmu curl) |
45 |
- $(conf_softmmu fdt) |
46 |
- $(conf_softmmu glusterfs) |
47 |
- $(conf_softmmu gnutls) |
48 |
- $(conf_softmmu gnutls nettle) |
49 |
- $(conf_softmmu gtk) |
50 |
- $(conf_softmmu infiniband rdma) |
51 |
- $(conf_softmmu iscsi libiscsi) |
52 |
- $(conf_softmmu jpeg vnc-jpeg) |
53 |
- $(conf_softmmu kernel_linux kvm) |
54 |
- $(conf_softmmu lzo) |
55 |
- $(conf_softmmu ncurses curses) |
56 |
- $(conf_softmmu nfs libnfs) |
57 |
- $(conf_softmmu numa) |
58 |
- $(conf_softmmu opengl) |
59 |
- $(conf_softmmu png vnc-png) |
60 |
- $(conf_softmmu rbd) |
61 |
- $(conf_softmmu sasl vnc-sasl) |
62 |
- $(conf_softmmu sdl) |
63 |
- $(conf_softmmu seccomp) |
64 |
- $(conf_softmmu smartcard) |
65 |
- $(conf_softmmu snappy) |
66 |
- $(conf_softmmu spice) |
67 |
- $(conf_softmmu ssh libssh2) |
68 |
- $(conf_softmmu usb libusb) |
69 |
- $(conf_softmmu usbredir usb-redir) |
70 |
- $(conf_softmmu vde) |
71 |
- $(conf_softmmu vhost-net) |
72 |
- $(conf_softmmu virgl virglrenderer) |
73 |
- $(conf_softmmu virtfs) |
74 |
- $(conf_softmmu vnc) |
75 |
- $(conf_softmmu vte) |
76 |
- $(conf_softmmu xen) |
77 |
- $(conf_softmmu xen xen-pci-passthrough) |
78 |
- $(conf_softmmu xfs xfsctl) |
79 |
+ $(conf_notuser accessibility brlapi) |
80 |
+ $(conf_notuser aio linux-aio) |
81 |
+ $(conf_notuser bzip2) |
82 |
+ $(conf_notuser bluetooth bluez) |
83 |
+ $(conf_notuser caps cap-ng) |
84 |
+ $(conf_notuser curl) |
85 |
+ $(conf_notuser fdt) |
86 |
+ $(conf_notuser glusterfs) |
87 |
+ $(conf_notuser gnutls) |
88 |
+ $(conf_notuser gnutls nettle) |
89 |
+ $(conf_notuser gtk) |
90 |
+ $(conf_notuser infiniband rdma) |
91 |
+ $(conf_notuser iscsi libiscsi) |
92 |
+ $(conf_notuser jpeg vnc-jpeg) |
93 |
+ $(conf_notuser kernel_linux kvm) |
94 |
+ $(conf_notuser lzo) |
95 |
+ $(conf_notuser ncurses curses) |
96 |
+ $(conf_notuser nfs libnfs) |
97 |
+ $(conf_notuser numa) |
98 |
+ $(conf_notuser opengl) |
99 |
+ $(conf_notuser png vnc-png) |
100 |
+ $(conf_notuser rbd) |
101 |
+ $(conf_notuser sasl vnc-sasl) |
102 |
+ $(conf_notuser sdl) |
103 |
+ $(conf_notuser seccomp) |
104 |
+ $(conf_notuser smartcard) |
105 |
+ $(conf_notuser snappy) |
106 |
+ $(conf_notuser spice) |
107 |
+ $(conf_notuser ssh libssh2) |
108 |
+ $(conf_notuser usb libusb) |
109 |
+ $(conf_notuser usbredir usb-redir) |
110 |
+ $(conf_notuser vde) |
111 |
+ $(conf_notuser vhost-net) |
112 |
+ $(conf_notuser virgl virglrenderer) |
113 |
+ $(conf_notuser virtfs) |
114 |
+ $(conf_notuser vnc) |
115 |
+ $(conf_notuser vte) |
116 |
+ $(conf_notuser xen) |
117 |
+ $(conf_notuser xen xen-pci-passthrough) |
118 |
+ $(conf_notuser xfs xfsctl) |
119 |
) |
120 |
|
121 |
+ if [[ ! ${buildtype} == "user" ]] ; then |
122 |
+ # audio options |
123 |
+ local audio_opts="oss" |
124 |
+ use alsa && audio_opts="alsa,${audio_opts}" |
125 |
+ use sdl && audio_opts="sdl,${audio_opts}" |
126 |
+ use pulseaudio && audio_opts="pa,${audio_opts}" |
127 |
+ conf_opts+=( |
128 |
+ --audio-drv-list="${audio_opts}" |
129 |
+ ) |
130 |
+ use gtk && conf_opts+=( --with-gtkabi=$(usex gtk2 2.0 3.0) ) |
131 |
+ use sdl && conf_opts+=( --with-sdlabi=$(usex sdl2 2.0 1.2) ) |
132 |
+ fi |
133 |
+ |
134 |
case ${buildtype} in |
135 |
user) |
136 |
conf_opts+=( |
137 |
@@ -452,21 +465,12 @@ qemu_src_configure() { |
138 |
local static_flag="static-user" |
139 |
;; |
140 |
softmmu) |
141 |
- # audio options |
142 |
- local audio_opts="oss" |
143 |
- use alsa && audio_opts="alsa,${audio_opts}" |
144 |
- use sdl && audio_opts="sdl,${audio_opts}" |
145 |
- use pulseaudio && audio_opts="pa,${audio_opts}" |
146 |
- |
147 |
conf_opts+=( |
148 |
--disable-linux-user |
149 |
--enable-system |
150 |
--disable-tools |
151 |
--with-system-pixman |
152 |
- --audio-drv-list="${audio_opts}" |
153 |
) |
154 |
- use gtk && conf_opts+=( --with-gtkabi=$(usex gtk2 2.0 3.0) ) |
155 |
- use sdl && conf_opts+=( --with-sdlabi=$(usex sdl2 2.0 1.2) ) |
156 |
local static_flag="static" |
157 |
;; |
158 |
tools) |
159 |
@@ -475,7 +479,6 @@ qemu_src_configure() { |
160 |
--disable-system |
161 |
--disable-blobs |
162 |
--enable-tools |
163 |
- $(use_enable bzip2) |
164 |
) |
165 |
local static_flag="static" |
166 |
;; |