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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 17977158232 for ; Mon, 9 Dec 2024 21:18:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ED59EE0C64; Mon, 9 Dec 2024 21:17:58 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C5021E0C64 for ; Mon, 9 Dec 2024 21:17:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C37303430C8 for ; Mon, 9 Dec 2024 21:17:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2D84E1898 for ; Mon, 9 Dec 2024 21:17:55 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1733778875.eb6244e0d892a15dc661ce53816c8a68e17c07a2.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/kexec-tools/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/kexec-tools/kexec-tools-9999.ebuild X-VCS-Directories: sys-apps/kexec-tools/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: eb6244e0d892a15dc661ce53816c8a68e17c07a2 X-VCS-Branch: master Date: Mon, 9 Dec 2024 21:17:55 +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: 278e7e8d-80c7-4c04-9e64-820679626ae8 X-Archives-Hash: 0f54ebeef99eac0bffd03ac55f90acdd commit: eb6244e0d892a15dc661ce53816c8a68e17c07a2 Author: Mike Gilbert gentoo org> AuthorDate: Mon Dec 9 21:09:29 2024 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Mon Dec 9 21:14:35 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb6244e0 sys-apps/kexec-tools: remove purgatory CFLAGS logic This apparently breaks purgatory with -march=native, etc. Closes: https://bugs.gentoo.org/926536 Signed-off-by: Mike Gilbert gentoo.org> sys-apps/kexec-tools/kexec-tools-9999.ebuild | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/sys-apps/kexec-tools/kexec-tools-9999.ebuild b/sys-apps/kexec-tools/kexec-tools-9999.ebuild index da2ab8cd8928..d0255bda1bc6 100644 --- a/sys-apps/kexec-tools/kexec-tools-9999.ebuild +++ b/sys-apps/kexec-tools/kexec-tools-9999.ebuild @@ -44,9 +44,6 @@ PATCHES=( src_prepare() { default - # Append PURGATORY_EXTRA_CFLAGS flags set by configure, instead of overriding them completely. - sed -e "/^PURGATORY_EXTRA_CFLAGS =/s/=/+=/" -i Makefile.in || die - if [[ "${PV}" == 9999 ]] ; then eautoreconf else @@ -67,23 +64,6 @@ src_configure() { econf "${myeconfargs[@]}" } -src_compile() { - # Respect CFLAGS for purgatory. - # purgatory/Makefile uses PURGATORY_EXTRA_CFLAGS variable. - # -mfunction-return=thunk and -mindirect-branch=thunk conflict with - # -mcmodel=large which is added by build system. - # Replace them with -mfunction-return=thunk-inline and -mindirect-branch=thunk-inline. - local flag flags=() - for flag in ${CFLAGS}; do - [[ ${flag} == -mfunction-return=thunk ]] && flag="-mfunction-return=thunk-inline" - [[ ${flag} == -mindirect-branch=thunk ]] && flag="-mindirect-branch=thunk-inline" - flags+=("${flag}") - done - local -x PURGATORY_EXTRA_CFLAGS="${flags[*]}" - - default -} - src_install() { default