1 |
commit: 1d79efd4de863153d918cb3dd66ec9a1c595e9b7 |
2 |
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Feb 28 05:44:38 2017 +0000 |
4 |
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Feb 28 05:44:38 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d79efd4 |
7 |
|
8 |
app-emulation/qemu: Reintroduce USE="static-user" |
9 |
|
10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
11 |
|
12 |
.../qemu/{qemu-2.8.0-r5.ebuild => qemu-2.8.0-r6.ebuild} | 12 ++++++++---- |
13 |
1 file changed, 8 insertions(+), 4 deletions(-) |
14 |
|
15 |
diff --git a/app-emulation/qemu/qemu-2.8.0-r5.ebuild b/app-emulation/qemu/qemu-2.8.0-r6.ebuild |
16 |
similarity index 98% |
17 |
rename from app-emulation/qemu/qemu-2.8.0-r5.ebuild |
18 |
rename to app-emulation/qemu/qemu-2.8.0-r6.ebuild |
19 |
index d4a03a7f1c..e1c6b9ba01 100644 |
20 |
--- a/app-emulation/qemu/qemu-2.8.0-r5.ebuild |
21 |
+++ b/app-emulation/qemu/qemu-2.8.0-r6.ebuild |
22 |
@@ -29,8 +29,8 @@ IUSE="accessibility +aio alsa bluetooth bzip2 +caps +curl debug +fdt |
23 |
glusterfs gnutls gtk gtk2 infiniband iscsi +jpeg kernel_linux |
24 |
kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs +png |
25 |
pulseaudio python rbd sasl +seccomp sdl sdl2 selinux smartcard snappy |
26 |
- spice ssh static systemtap tci test +threads usb usbredir vde |
27 |
- +vhost-net virgl virtfs +vnc vte xattr xen xfs" |
28 |
+ spice ssh static static-user systemtap tci test +threads usb usbredir |
29 |
+ vde +vhost-net virgl virtfs +vnc vte xattr xen xfs" |
30 |
|
31 |
COMMON_TARGETS="aarch64 alpha arm cris i386 m68k microblaze microblazeel |
32 |
mips mips64 mips64el mipsel or32 ppc ppc64 s390x sh4 sh4eb sparc |
33 |
@@ -53,7 +53,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} |
34 |
qemu_softmmu_targets_ppc? ( fdt ) |
35 |
qemu_softmmu_targets_ppc64? ( fdt ) |
36 |
sdl2? ( sdl ) |
37 |
- static? ( !alsa !pulseaudio !bluetooth !opengl !gtk !gtk2 ) |
38 |
+ static? ( static-user !alsa !bluetooth !gtk !gtk2 !opengl !pulseaudio ) |
39 |
virtfs? ( xattr ) |
40 |
vte? ( gtk )" |
41 |
|
42 |
@@ -174,6 +174,7 @@ DEPEND="${CDEPEND} |
43 |
kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) |
44 |
gtk? ( nls? ( sys-devel/gettext ) ) |
45 |
static? ( ${TARGETS_DEPEND} ) |
46 |
+ static-user? ( ${TARGETS_DEPEND} ) |
47 |
test? ( |
48 |
dev-libs/glib[utils] |
49 |
sys-devel/bc |
50 |
@@ -469,6 +470,7 @@ qemu_src_configure() { |
51 |
--disable-blobs |
52 |
--disable-tools |
53 |
) |
54 |
+ local static_flag="static-user" |
55 |
;; |
56 |
softmmu) |
57 |
# audio options |
58 |
@@ -486,6 +488,7 @@ qemu_src_configure() { |
59 |
) |
60 |
use gtk && conf_opts+=( --with-gtkabi=$(usex gtk2 2.0 3.0) ) |
61 |
use sdl && conf_opts+=( --with-sdlabi=$(usex sdl2 2.0 1.2) ) |
62 |
+ local static_flag="static" |
63 |
;; |
64 |
tools) |
65 |
conf_opts+=( |
66 |
@@ -495,6 +498,7 @@ qemu_src_configure() { |
67 |
--enable-tools |
68 |
$(use_enable bzip2) |
69 |
) |
70 |
+ local static_flag="static" |
71 |
;; |
72 |
esac |
73 |
|
74 |
@@ -507,7 +511,7 @@ qemu_src_configure() { |
75 |
# We always want to attempt to build with PIE support as it results |
76 |
# in a more secure binary. But it doesn't work with static or if |
77 |
# the current GCC doesn't have PIE support. |
78 |
- if use static; then |
79 |
+ if use ${static_flag}; then |
80 |
conf_opts+=( --static --disable-pie ) |
81 |
else |
82 |
gcc-specs-pie && conf_opts+=( --enable-pie ) |