From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DB0501382C5 for ; Mon, 29 Mar 2021 22:55:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 05F1AE0845; Mon, 29 Mar 2021 22:55:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E1D6AE0845 for ; Mon, 29 Mar 2021 22:55:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 98FCC340E08 for ; Mon, 29 Mar 2021 22:55:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3C879632 for ; Mon, 29 Mar 2021 22:55:17 +0000 (UTC) From: "Sergei Trofimovich" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergei Trofimovich" Message-ID: <1617058513.0837524b145743820a05177f77a6d7c05f677df4.slyfox@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/qemu/qemu-5.2.0-r3.ebuild X-VCS-Directories: app-emulation/qemu/ X-VCS-Committer: slyfox X-VCS-Committer-Name: Sergei Trofimovich X-VCS-Revision: 0837524b145743820a05177f77a6d7c05f677df4 X-VCS-Branch: master Date: Mon, 29 Mar 2021 22:55:17 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7f8fa0ca-cdc6-4724-909c-701b48099a73 X-Archives-Hash: 6216ccf15ef621b7ec1356ba40371a0a commit: 0837524b145743820a05177f77a6d7c05f677df4 Author: Sergei Trofimovich gentoo org> AuthorDate: Mon Mar 29 22:55:01 2021 +0000 Commit: Sergei Trofimovich gentoo 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 niflheim.info Closes: https://bugs.gentoo.org/726560 Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Sergei Trofimovich 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