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