| 1 |
commit: aafb01bd5375daf076ca07cc59808995d2cedcf5 |
| 2 |
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jun 10 03:18:18 2018 +0000 |
| 4 |
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jun 10 03:30:01 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aafb01bd |
| 7 |
|
| 8 |
app-emulation/qemu: try to fix dependency mess |
| 9 |
|
| 10 |
- add missing USE=infiniband dependencies |
| 11 |
- fix automagic libxml2 dependency, also fixes static build |
| 12 |
- add python-3 support |
| 13 |
- fix automagic libxbcommon dependency |
| 14 |
|
| 15 |
Closes: https://bugs.gentoo.org/656006 |
| 16 |
Closes: https://bugs.gentoo.org/656076 |
| 17 |
Closes: https://bugs.gentoo.org/657428 |
| 18 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
| 19 |
|
| 20 |
.../qemu/{qemu-2.12.0.ebuild => qemu-2.12.0-r1.ebuild} | 16 ++++++++++++++-- |
| 21 |
1 file changed, 14 insertions(+), 2 deletions(-) |
| 22 |
|
| 23 |
diff --git a/app-emulation/qemu/qemu-2.12.0.ebuild b/app-emulation/qemu/qemu-2.12.0-r1.ebuild |
| 24 |
similarity index 98% |
| 25 |
rename from app-emulation/qemu/qemu-2.12.0.ebuild |
| 26 |
rename to app-emulation/qemu/qemu-2.12.0-r1.ebuild |
| 27 |
index e74669774d1..886789224cf 100644 |
| 28 |
--- a/app-emulation/qemu/qemu-2.12.0.ebuild |
| 29 |
+++ b/app-emulation/qemu/qemu-2.12.0-r1.ebuild |
| 30 |
@@ -3,7 +3,7 @@ |
| 31 |
|
| 32 |
EAPI="6" |
| 33 |
|
| 34 |
-PYTHON_COMPAT=( python2_7 ) |
| 35 |
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) |
| 36 |
PYTHON_REQ_USE="ncurses,readline" |
| 37 |
|
| 38 |
PLOCALES="bg de_DE fr_FR hu it tr zh_CN" |
| 39 |
@@ -82,6 +82,8 @@ ALL_DEPEND=" |
| 40 |
# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...) |
| 41 |
# softmmu targets (qemu-system-*). |
| 42 |
SOFTMMU_TOOLS_DEPEND=" |
| 43 |
+ dev-libs/libxml2[static-libs(+)] |
| 44 |
+ x11-libs/libxkbcommon[static-libs(+)] |
| 45 |
>=x11-libs/pixman-0.28.0[static-libs(+)] |
| 46 |
accessibility? ( |
| 47 |
app-accessibility/brltty[api] |
| 48 |
@@ -110,7 +112,11 @@ SOFTMMU_TOOLS_DEPEND=" |
| 49 |
vte? ( x11-libs/vte:2.91 ) |
| 50 |
) |
| 51 |
) |
| 52 |
- infiniband? ( sys-fabric/librdmacm:=[static-libs(+)] ) |
| 53 |
+ infiniband? ( |
| 54 |
+ sys-fabric/libibumad:=[static-libs(+)] |
| 55 |
+ sys-fabric/libibverbs:=[static-libs(+)] |
| 56 |
+ sys-fabric/librdmacm:=[static-libs(+)] |
| 57 |
+ ) |
| 58 |
iscsi? ( net-libs/libiscsi ) |
| 59 |
jpeg? ( virtual/jpeg:0=[static-libs(+)] ) |
| 60 |
lzo? ( dev-libs/lzo:2[static-libs(+)] ) |
| 61 |
@@ -475,6 +481,12 @@ qemu_src_configure() { |
| 62 |
$(conf_notuser xfs xfsctl) |
| 63 |
) |
| 64 |
|
| 65 |
+ if [[ ${buildtype} == "user" ]] ; then |
| 66 |
+ conf_opts+=( --disable-libxml2 ) |
| 67 |
+ else |
| 68 |
+ conf_opts+=( --enable-libxml2 ) |
| 69 |
+ fi |
| 70 |
+ |
| 71 |
if [[ ! ${buildtype} == "user" ]] ; then |
| 72 |
# audio options |
| 73 |
local audio_opts="oss" |
Archives