| 1 |
commit: 182471d585d63fe286d631949dc13abd6c209137 |
| 2 |
Author: Alexey Sokolov <sokolov <AT> google <DOT> com> |
| 3 |
AuthorDate: Thu Feb 1 23:24:05 2018 +0000 |
| 4 |
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 11 20:27:01 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=182471d5 |
| 7 |
|
| 8 |
app-emulation/qemu: Fix build with latest git: |
| 9 |
|
| 10 |
* add hppa to softmmu targets |
| 11 |
* add aarch64_be to user targets |
| 12 |
* update the CFLAGS patch |
| 13 |
|
| 14 |
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org> |
| 15 |
Closes: https://github.com/gentoo/gentoo/pull/7020 |
| 16 |
|
| 17 |
.../qemu/files/qemu-2.11.9999-cflags.patch | 24 ++++++++++++++++++++++ |
| 18 |
app-emulation/qemu/qemu-9999.ebuild | 6 +++--- |
| 19 |
profiles/desc/qemu_softmmu_targets.desc | 1 + |
| 20 |
profiles/desc/qemu_user_targets.desc | 3 ++- |
| 21 |
4 files changed, 30 insertions(+), 4 deletions(-) |
| 22 |
|
| 23 |
diff --git a/app-emulation/qemu/files/qemu-2.11.9999-cflags.patch b/app-emulation/qemu/files/qemu-2.11.9999-cflags.patch |
| 24 |
new file mode 100644 |
| 25 |
index 00000000000..8d7c387851a |
| 26 |
--- /dev/null |
| 27 |
+++ b/app-emulation/qemu/files/qemu-2.11.9999-cflags.patch |
| 28 |
@@ -0,0 +1,24 @@ |
| 29 |
+--- a/configure 2018-02-01 22:51:53.068467555 +0000 |
| 30 |
++++ b/configure 2018-02-01 22:52:23.965041387 +0000 |
| 31 |
+@@ -5212,21 +5212,12 @@ fi |
| 32 |
+ if test "$gcov" = "yes" ; then |
| 33 |
+ CFLAGS="-fprofile-arcs -ftest-coverage -g $CFLAGS" |
| 34 |
+ LDFLAGS="-fprofile-arcs -ftest-coverage $LDFLAGS" |
| 35 |
+-elif test "$fortify_source" = "yes" ; then |
| 36 |
+- CFLAGS="-O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 $CFLAGS" |
| 37 |
+ elif test "$debug" = "yes"; then |
| 38 |
+- if compile_prog "-Og" ""; then |
| 39 |
+- CFLAGS="-Og $CFLAGS" |
| 40 |
+- elif compile_prog "-O1" ""; then |
| 41 |
+- CFLAGS="-O1 $CFLAGS" |
| 42 |
+- fi |
| 43 |
+ # Workaround GCC false-positive Wuninitialized bugs with Og or O1: |
| 44 |
+ # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=24639 |
| 45 |
+ if cc_has_warning_flag "-Wno-maybe-uninitialized"; then |
| 46 |
+ CFLAGS="-Wno-maybe-uninitialized $CFLAGS" |
| 47 |
+ fi |
| 48 |
+-else |
| 49 |
+- CFLAGS="-O2 $CFLAGS" |
| 50 |
+ fi |
| 51 |
+ |
| 52 |
+ ########################################## |
| 53 |
|
| 54 |
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild |
| 55 |
index 97e3556cc40..51306b78bcb 100644 |
| 56 |
--- a/app-emulation/qemu/qemu-9999.ebuild |
| 57 |
+++ b/app-emulation/qemu/qemu-9999.ebuild |
| 58 |
@@ -34,13 +34,13 @@ IUSE="accessibility +aio alsa bluetooth bzip2 +caps +curl debug +fdt |
| 59 |
spice ssh static static-user systemtap tci test usb usbredir vde |
| 60 |
+vhost-net virgl virtfs +vnc vte xattr xen xfs" |
| 61 |
|
| 62 |
-COMMON_TARGETS="aarch64 alpha arm cris i386 m68k microblaze microblazeel |
| 63 |
+COMMON_TARGETS="aarch64 alpha arm cris hppa i386 m68k microblaze microblazeel |
| 64 |
mips mips64 mips64el mipsel nios2 or1k ppc ppc64 s390x sh4 sh4eb sparc |
| 65 |
sparc64 x86_64" |
| 66 |
IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} |
| 67 |
lm32 moxie ppcemb tricore unicore32 xtensa xtensaeb" |
| 68 |
IUSE_USER_TARGETS="${COMMON_TARGETS} |
| 69 |
- armeb hppa mipsn32 mipsn32el ppc64abi32 ppc64le sparc32plus tilegx" |
| 70 |
+ aarch64_be armeb mipsn32 mipsn32el ppc64abi32 ppc64le sparc32plus tilegx" |
| 71 |
|
| 72 |
use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS}) |
| 73 |
use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS}) |
| 74 |
@@ -201,7 +201,7 @@ RDEPEND="${CDEPEND} |
| 75 |
selinux? ( sec-policy/selinux-qemu )" |
| 76 |
|
| 77 |
PATCHES=( |
| 78 |
- "${FILESDIR}"/${PN}-2.5.0-cflags.patch |
| 79 |
+ "${FILESDIR}"/${PN}-2.11.9999-cflags.patch |
| 80 |
"${FILESDIR}"/${PN}-2.5.0-sysmacros.patch |
| 81 |
) |
| 82 |
|
| 83 |
|
| 84 |
diff --git a/profiles/desc/qemu_softmmu_targets.desc b/profiles/desc/qemu_softmmu_targets.desc |
| 85 |
index 77be14da04b..19bcfdebdd9 100644 |
| 86 |
--- a/profiles/desc/qemu_softmmu_targets.desc |
| 87 |
+++ b/profiles/desc/qemu_softmmu_targets.desc |
| 88 |
@@ -9,6 +9,7 @@ aarch64 - ARM64 system emulation target |
| 89 |
alpha - system emulation target |
| 90 |
arm - system emulation target |
| 91 |
cris - system emulation target |
| 92 |
+hppa - system emulation target |
| 93 |
i386 - system emulation target |
| 94 |
lm32 - LatticeMico32 system emulation target |
| 95 |
m68k - system emulation target |
| 96 |
|
| 97 |
diff --git a/profiles/desc/qemu_user_targets.desc b/profiles/desc/qemu_user_targets.desc |
| 98 |
index 76c2721cd8c..721a1f566e2 100644 |
| 99 |
--- a/profiles/desc/qemu_user_targets.desc |
| 100 |
+++ b/profiles/desc/qemu_user_targets.desc |
| 101 |
@@ -6,11 +6,12 @@ |
| 102 |
# Keep it sorted. |
| 103 |
|
| 104 |
aarch64 - ARM64 userspace emulation target |
| 105 |
+aarch64_be - ARM64 big endian userspace emulation target |
| 106 |
alpha - userspace emulation target |
| 107 |
arm - ARM (little endian) userspace emulation target |
| 108 |
armeb - ARM (big endian) userspace emulation target |
| 109 |
cris - userspace emulation target |
| 110 |
-hppa - usersparce emulation target |
| 111 |
+hppa - userspace emulation target |
| 112 |
i386 - userspace emulation target |
| 113 |
m68k - userspace emulation target |
| 114 |
microblazeel - userspace emulation target |
Archives