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 (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7CB3F15808B for ; Tue, 13 Feb 2024 18:43:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8CB79E29A1; Tue, 13 Feb 2024 18:43:51 +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 6AB5FE29A1 for ; Tue, 13 Feb 2024 18:43:51 +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 4C2FA34307B for ; Tue, 13 Feb 2024 18:43:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A623513DB for ; Tue, 13 Feb 2024 18:43:47 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1707849681.548e73667bcd5682ffb9eea0d78463a5f74edb7c.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-terms/kitty/kitty-0.32.1.ebuild x11-terms/kitty/kitty-0.32.2.ebuild x11-terms/kitty/kitty-9999.ebuild X-VCS-Directories: x11-terms/kitty/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 548e73667bcd5682ffb9eea0d78463a5f74edb7c X-VCS-Branch: master Date: Tue, 13 Feb 2024 18:43:47 +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: 834ec909-952c-4526-8faa-9362089f7f9c X-Archives-Hash: e57355fe1c276307eb59db748eff2899 commit: 548e73667bcd5682ffb9eea0d78463a5f74edb7c Author: Ionen Wolkens gentoo org> AuthorDate: Tue Feb 13 18:20:00 2024 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Tue Feb 13 18:41:21 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=548e7366 x11-terms/kitty: workaround link failure with Go + gcc + -g(gdb)3 Not interested in pursuing a potential Go bug, so just do a workaround. May recheck now and then to see if it's not longer needed with toolchain updates. If this is a widespread issue, it may need visiting in go-env's go-env_set_compile_environment instead though. Not an issue for the non-CGO_CFLAGS bits, so can keep -g3 elsewhere. Closes: https://bugs.gentoo.org/924436 Signed-off-by: Ionen Wolkens gentoo.org> x11-terms/kitty/kitty-0.32.1.ebuild | 12 +++++++++++- x11-terms/kitty/kitty-0.32.2.ebuild | 12 +++++++++++- x11-terms/kitty/kitty-9999.ebuild | 12 +++++++++++- 3 files changed, 33 insertions(+), 3 deletions(-) diff --git a/x11-terms/kitty/kitty-0.32.1.ebuild b/x11-terms/kitty/kitty-0.32.1.ebuild index ce3ee5eb6d93..de8a2affadb5 100644 --- a/x11-terms/kitty/kitty-0.32.1.ebuild +++ b/x11-terms/kitty/kitty-0.32.1.ebuild @@ -4,7 +4,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..12} ) -inherit edo go-env optfeature multiprocessing +inherit edo flag-o-matic go-env optfeature multiprocessing inherit python-single-r1 toolchain-funcs xdg if [[ ${PV} == 9999 ]]; then @@ -132,6 +132,16 @@ src_compile() { local -x GOFLAGS="-p=$(makeopts_jobs) -v -x" use ppc64 && [[ $(tc-endian) == big ]] || GOFLAGS+=" -buildmode=pie" + # workaround link errors with Go + gcc + -g3 (bug #924436), + # retry now and then to see if can be dropped + tc-is-gcc && + CGO_CFLAGS=$( + CFLAGS=${CGO_CFLAGS} + replace-flags -g3 -g + replace-flags -ggdb3 -ggdb + printf %s "${CFLAGS}" + ) + local conf=( --disable-link-time-optimization --ignore-compiler-warnings diff --git a/x11-terms/kitty/kitty-0.32.2.ebuild b/x11-terms/kitty/kitty-0.32.2.ebuild index ad738d565f30..5099295c3d2c 100644 --- a/x11-terms/kitty/kitty-0.32.2.ebuild +++ b/x11-terms/kitty/kitty-0.32.2.ebuild @@ -4,7 +4,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..12} ) -inherit edo go-env optfeature multiprocessing +inherit edo flag-o-matic go-env optfeature multiprocessing inherit python-single-r1 toolchain-funcs xdg if [[ ${PV} == 9999 ]]; then @@ -132,6 +132,16 @@ src_compile() { local -x GOFLAGS="-p=$(makeopts_jobs) -v -x" use ppc64 && [[ $(tc-endian) == big ]] || GOFLAGS+=" -buildmode=pie" + # workaround link errors with Go + gcc + -g3 (bug #924436), + # retry now and then to see if can be dropped + tc-is-gcc && + CGO_CFLAGS=$( + CFLAGS=${CGO_CFLAGS} + replace-flags -g3 -g + replace-flags -ggdb3 -ggdb + printf %s "${CFLAGS}" + ) + local conf=( --disable-link-time-optimization --ignore-compiler-warnings diff --git a/x11-terms/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild index ad738d565f30..5099295c3d2c 100644 --- a/x11-terms/kitty/kitty-9999.ebuild +++ b/x11-terms/kitty/kitty-9999.ebuild @@ -4,7 +4,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..12} ) -inherit edo go-env optfeature multiprocessing +inherit edo flag-o-matic go-env optfeature multiprocessing inherit python-single-r1 toolchain-funcs xdg if [[ ${PV} == 9999 ]]; then @@ -132,6 +132,16 @@ src_compile() { local -x GOFLAGS="-p=$(makeopts_jobs) -v -x" use ppc64 && [[ $(tc-endian) == big ]] || GOFLAGS+=" -buildmode=pie" + # workaround link errors with Go + gcc + -g3 (bug #924436), + # retry now and then to see if can be dropped + tc-is-gcc && + CGO_CFLAGS=$( + CFLAGS=${CGO_CFLAGS} + replace-flags -g3 -g + replace-flags -ggdb3 -ggdb + printf %s "${CFLAGS}" + ) + local conf=( --disable-link-time-optimization --ignore-compiler-warnings