| 1 |
commit: 0837524b145743820a05177f77a6d7c05f677df4 |
| 2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Mar 29 22:55:01 2021 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Mar 29 22:55:13 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0837524b |
| 7 |
|
| 8 |
app-emulation/qemu: filter out -fcommon |
| 9 |
|
| 10 |
Next qemu release should have a proper fix for symbol collision: |
| 11 |
$ git grep -P '[^a-z_]machine_init_done[^a-z_]' | cat |
| 12 |
softmmu/vl.c:bool machine_init_done; |
| 13 |
stubs/machine-init-done.c:bool machine_init_done = true; |
| 14 |
|
| 15 |
I'm not comfortable backporting the change and only |
| 16 |
filtering out -fcommon as a workaround. We'll remove |
| 17 |
a workaround in next release. |
| 18 |
|
| 19 |
Reported-by: Agostino Sarubbo |
| 20 |
Reported-by: gordon <AT> niflheim.info |
| 21 |
Closes: https://bugs.gentoo.org/726560 |
| 22 |
Package-Manager: Portage-3.0.17, Repoman-3.0.2 |
| 23 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
| 24 |
|
| 25 |
app-emulation/qemu/qemu-5.2.0-r3.ebuild | 9 +++++++-- |
| 26 |
1 file changed, 7 insertions(+), 2 deletions(-) |
| 27 |
|
| 28 |
diff --git a/app-emulation/qemu/qemu-5.2.0-r3.ebuild b/app-emulation/qemu/qemu-5.2.0-r3.ebuild |
| 29 |
index 62b50afd5d9..f986ee42a1d 100644 |
| 30 |
--- a/app-emulation/qemu/qemu-5.2.0-r3.ebuild |
| 31 |
+++ b/app-emulation/qemu/qemu-5.2.0-r3.ebuild |
| 32 |
@@ -8,8 +8,9 @@ PYTHON_REQ_USE="ncurses,readline" |
| 33 |
|
| 34 |
FIRMWARE_ABI_VERSION="4.0.0-r50" |
| 35 |
|
| 36 |
-inherit eutils linux-info toolchain-funcs multilib python-r1 \ |
| 37 |
- udev fcaps readme.gentoo-r1 pax-utils l10n xdg-utils |
| 38 |
+inherit eutils linux-info toolchain-funcs multilib python-r1 |
| 39 |
+inherit udev fcaps readme.gentoo-r1 pax-utils l10n xdg-utils |
| 40 |
+inherit flag-o-matic |
| 41 |
|
| 42 |
if [[ ${PV} = *9999* ]]; then |
| 43 |
EGIT_REPO_URI="https://git.qemu.org/git/qemu.git" |
| 44 |
@@ -359,6 +360,10 @@ check_targets() { |
| 45 |
} |
| 46 |
|
| 47 |
src_prepare() { |
| 48 |
+ # workaround -fcommon breakage: bug #726560 |
| 49 |
+ [[ ${PV} == 5.2.0 ]] || die "Check if -fcommon hack is needed" |
| 50 |
+ filter-flags -fcommon |
| 51 |
+ |
| 52 |
check_targets IUSE_SOFTMMU_TARGETS softmmu |
| 53 |
check_targets IUSE_USER_TARGETS linux-user |
Archives