commit:     d5f4929e0ac3f31101d34ea8cfb5d6ecf1dc38cf
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 15 23:25:59 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Aug 16 00:04:35 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5f4929e

x11-terms/kitty: remove redundant workaround

Still an issue, but workaround is now handled by go-env.eclass.

Bug: https://bugs.gentoo.org/924436
Thanks-to: Sam James <sam <AT> gentoo.org>
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 x11-terms/kitty/kitty-0.34.1.ebuild | 12 +-----------
 x11-terms/kitty/kitty-0.35.2.ebuild | 12 +-----------
 x11-terms/kitty/kitty-9999.ebuild   | 12 +-----------
 3 files changed, 3 insertions(+), 33 deletions(-)

diff --git a/x11-terms/kitty/kitty-0.34.1.ebuild 
b/x11-terms/kitty/kitty-0.34.1.ebuild
index 2fd93cddd02c..cdd3efe60acc 100644
--- a/x11-terms/kitty/kitty-0.34.1.ebuild
+++ b/x11-terms/kitty/kitty-0.34.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{10..12} )
-inherit edo flag-o-matic go-env optfeature multiprocessing
+inherit edo go-env optfeature multiprocessing
 inherit python-single-r1 toolchain-funcs xdg
 
 if [[ ${PV} == 9999 ]]; then
@@ -136,16 +136,6 @@ src_compile() {
        local -x GOFLAGS="-p=$(makeopts_jobs) -v -x -buildvcs=false"
        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.35.2.ebuild 
b/x11-terms/kitty/kitty-0.35.2.ebuild
index ec0e87ecfb7d..6ee50e0f8ad0 100644
--- a/x11-terms/kitty/kitty-0.35.2.ebuild
+++ b/x11-terms/kitty/kitty-0.35.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{10..13} )
-inherit edo flag-o-matic go-env optfeature multiprocessing
+inherit edo go-env optfeature multiprocessing
 inherit python-single-r1 toolchain-funcs xdg
 
 if [[ ${PV} == 9999 ]]; then
@@ -136,16 +136,6 @@ src_compile() {
        local -x GOFLAGS="-p=$(makeopts_jobs) -v -x -buildvcs=false"
        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 f90f58f4b109..9e678478d906 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..13} )
-inherit edo flag-o-matic go-env optfeature multiprocessing
+inherit edo go-env optfeature multiprocessing
 inherit python-single-r1 toolchain-funcs xdg
 
 if [[ ${PV} == 9999 ]]; then
@@ -137,16 +137,6 @@ src_compile() {
        local -x GOFLAGS="-p=$(makeopts_jobs) -v -x -buildvcs=false"
        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

Reply via email to