| 1 |
commit: 6e259a58ba456e822ebb21e60b585eef905f65aa |
| 2 |
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Feb 28 05:47:40 2017 +0000 |
| 4 |
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Feb 28 05:47:40 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e259a58 |
| 7 |
|
| 8 |
app-emulation/qemu: update live ebuild |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 11 |
|
| 12 |
app-emulation/qemu/qemu-2.8.0-r6.ebuild | 2 +- |
| 13 |
app-emulation/qemu/qemu-9999.ebuild | 12 ++++++++---- |
| 14 |
2 files changed, 9 insertions(+), 5 deletions(-) |
| 15 |
|
| 16 |
diff --git a/app-emulation/qemu/qemu-2.8.0-r6.ebuild b/app-emulation/qemu/qemu-2.8.0-r6.ebuild |
| 17 |
index e1c6b9ba01..9c2b891c89 100644 |
| 18 |
--- a/app-emulation/qemu/qemu-2.8.0-r6.ebuild |
| 19 |
+++ b/app-emulation/qemu/qemu-2.8.0-r6.ebuild |
| 20 |
@@ -13,7 +13,7 @@ inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \ |
| 21 |
|
| 22 |
if [[ ${PV} = *9999* ]]; then |
| 23 |
EGIT_REPO_URI="git://git.qemu.org/qemu.git" |
| 24 |
- inherit git-2 |
| 25 |
+ inherit git-r3 |
| 26 |
SRC_URI="" |
| 27 |
else |
| 28 |
SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.bz2" |
| 29 |
|
| 30 |
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild |
| 31 |
index 33c2b1302b..93e94ad168 100644 |
| 32 |
--- a/app-emulation/qemu/qemu-9999.ebuild |
| 33 |
+++ b/app-emulation/qemu/qemu-9999.ebuild |
| 34 |
@@ -29,8 +29,8 @@ IUSE="accessibility +aio alsa bluetooth bzip2 +caps +curl debug +fdt |
| 35 |
glusterfs gnutls gtk gtk2 infiniband iscsi +jpeg kernel_linux |
| 36 |
kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs +png |
| 37 |
pulseaudio python rbd sasl +seccomp sdl sdl2 selinux smartcard snappy |
| 38 |
- spice ssh static systemtap tci test +threads usb usbredir vde |
| 39 |
- +vhost-net virgl virtfs +vnc vte xattr xen xfs" |
| 40 |
+ spice ssh static static-user systemtap tci test +threads usb usbredir |
| 41 |
+ vde +vhost-net virgl virtfs +vnc vte xattr xen xfs" |
| 42 |
|
| 43 |
COMMON_TARGETS="aarch64 alpha arm cris i386 m68k microblaze microblazeel |
| 44 |
mips mips64 mips64el mipsel nios2 or1k ppc ppc64 s390x sh4 sh4eb sparc |
| 45 |
@@ -53,7 +53,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 46 |
qemu_softmmu_targets_ppc? ( fdt ) |
| 47 |
qemu_softmmu_targets_ppc64? ( fdt ) |
| 48 |
sdl2? ( sdl ) |
| 49 |
- static? ( !alsa !pulseaudio !bluetooth !opengl !gtk !gtk2 ) |
| 50 |
+ static? ( static-user !alsa !bluetooth !gtk !gtk2 !opengl !pulseaudio ) |
| 51 |
virtfs? ( xattr ) |
| 52 |
vte? ( gtk )" |
| 53 |
|
| 54 |
@@ -174,6 +174,7 @@ DEPEND="${CDEPEND} |
| 55 |
kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) |
| 56 |
gtk? ( nls? ( sys-devel/gettext ) ) |
| 57 |
static? ( ${TARGETS_DEPEND} ) |
| 58 |
+ static-user? ( ${TARGETS_DEPEND} ) |
| 59 |
test? ( |
| 60 |
dev-libs/glib[utils] |
| 61 |
sys-devel/bc |
| 62 |
@@ -449,6 +450,7 @@ qemu_src_configure() { |
| 63 |
--disable-blobs |
| 64 |
--disable-tools |
| 65 |
) |
| 66 |
+ local static_flag="static-user" |
| 67 |
;; |
| 68 |
softmmu) |
| 69 |
# audio options |
| 70 |
@@ -466,6 +468,7 @@ qemu_src_configure() { |
| 71 |
) |
| 72 |
use gtk && conf_opts+=( --with-gtkabi=$(usex gtk2 2.0 3.0) ) |
| 73 |
use sdl && conf_opts+=( --with-sdlabi=$(usex sdl2 2.0 1.2) ) |
| 74 |
+ local static_flag="static" |
| 75 |
;; |
| 76 |
tools) |
| 77 |
conf_opts+=( |
| 78 |
@@ -475,6 +478,7 @@ qemu_src_configure() { |
| 79 |
--enable-tools |
| 80 |
$(use_enable bzip2) |
| 81 |
) |
| 82 |
+ local static_flag="static" |
| 83 |
;; |
| 84 |
esac |
| 85 |
|
| 86 |
@@ -487,7 +491,7 @@ qemu_src_configure() { |
| 87 |
# We always want to attempt to build with PIE support as it results |
| 88 |
# in a more secure binary. But it doesn't work with static or if |
| 89 |
# the current GCC doesn't have PIE support. |
| 90 |
- if use static; then |
| 91 |
+ if use ${static_flag}; then |
| 92 |
conf_opts+=( --static --disable-pie ) |
| 93 |
else |
| 94 |
gcc-specs-pie && conf_opts+=( --enable-pie ) |
Archives