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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6008E158064 for ; Sat, 11 May 2024 06:44:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9C585E29A2; Sat, 11 May 2024 06:44:37 +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 746DFE29A2 for ; Sat, 11 May 2024 06:44:37 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 71339343022 for ; Sat, 11 May 2024 06:44:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0C74E1A88 for ; Sat, 11 May 2024 06:44:35 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1715409872.567cb9242b182006a4b80f9266e3641f422472f0.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/go-env.eclass X-VCS-Directories: eclass/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 567cb9242b182006a4b80f9266e3641f422472f0 X-VCS-Branch: master Date: Sat, 11 May 2024 06:44:35 +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: e1ddd098-8a49-454f-ab23-b44eea923e9b X-Archives-Hash: aa939e2d1ef597232339e3c85d1656c1 commit: 567cb9242b182006a4b80f9266e3641f422472f0 Author: Joonas Niilola gentoo org> AuthorDate: Sat May 11 06:41:45 2024 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Sat May 11 06:44:32 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=567cb924 go-env.eclass: temporary EAPI guard for EAPI-6 - there are still a handful of EAPI-6 ebuilds which don't support BDEPENDs. While the has_version check is imperfect without -b switch, this is better than nothing. I assume gcc[debug] isn't be that widely used either. Signed-off-by: Joonas Niilola gentoo.org> eclass/go-env.eclass | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/eclass/go-env.eclass b/eclass/go-env.eclass index e0987ec7dee7..1a2c9787a146 100644 --- a/eclass/go-env.eclass +++ b/eclass/go-env.eclass @@ -34,7 +34,14 @@ go-env_set_compile_environment() { use x86 && export GO386=$(go-env_go386) # XXX: Hack for checking ICE (bug #912152, gcc PR113204) - has_version -b "sys-devel/gcc[debug]" && filter-lto + case ${EAPI} in + 6) + has_version "sys-devel/gcc[debug]" && filter-lto + ;; + *) + has_version -b "sys-devel/gcc[debug]" && filter-lto + ;; + esac export CGO_CFLAGS="${CGO_CFLAGS:-$CFLAGS}" export CGO_CPPFLAGS="${CGO_CPPFLAGS:-$CPPFLAGS}"