From: James Le Cuirot <chewi@gentoo.org>
To: gentoo-dev <gentoo-dev@lists.gentoo.org>
Cc: William Hubbs <williamh@gentoo.org>, James Le Cuirot <chewi@gentoo.org>
Subject: [gentoo-dev] [PATCH 5/8] go-env.eclass: Establish EAPI 7 and 8 as supported
Date: Tue, 9 Jul 2024 22:07:37 +0100 [thread overview]
Message-ID: <20240709210749.14002-5-chewi@gentoo.org> (raw)
In-Reply-To: <20240709210749.14002-1-chewi@gentoo.org>
Signed-off-by: James Le Cuirot <chewi@gentoo.org>
---
eclass/go-env.eclass | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/eclass/go-env.eclass b/eclass/go-env.eclass
index 1a2c9787a146b..c34c634bb6003 100644
--- a/eclass/go-env.eclass
+++ b/eclass/go-env.eclass
@@ -6,11 +6,17 @@
# Flatcar Linux Maintainers <infra@flatcar-linux.org>
# @AUTHOR:
# Flatcar Linux Maintainers <infra@flatcar-linux.org>
+# @SUPPORTED_EAPIS: 7 8
# @BLURB: Helper eclass for setting the Go compile environment. Required for cross-compiling.
# @DESCRIPTION:
# This eclass includes helper functions for setting the compile environment for Go ebuilds.
# Intended to be called by other Go eclasses in an early build stage, e.g. src_unpack.
+case ${EAPI} in
+ 7|8) ;;
+ *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
+esac
+
if [[ -z ${_GO_ENV_ECLASS} ]]; then
_GO_ENV_ECLASS=1
@@ -34,14 +40,7 @@ go-env_set_compile_environment() {
use x86 && export GO386=$(go-env_go386)
# XXX: Hack for checking ICE (bug #912152, gcc PR113204)
- case ${EAPI} in
- 6)
- has_version "sys-devel/gcc[debug]" && filter-lto
- ;;
- *)
- has_version -b "sys-devel/gcc[debug]" && filter-lto
- ;;
- esac
+ has_version -b "sys-devel/gcc[debug]" && filter-lto
export CGO_CFLAGS="${CGO_CFLAGS:-$CFLAGS}"
export CGO_CPPFLAGS="${CGO_CPPFLAGS:-$CPPFLAGS}"
--
2.45.2
next prev parent reply other threads:[~2024-07-09 21:11 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-09 21:07 [gentoo-dev] [PATCH 1/8] golang-vcs.eclass: Drop support for EAPI 6 James Le Cuirot
2024-07-09 21:07 ` [gentoo-dev] [PATCH 2/8] golang-vcs-snapshot.eclass: " James Le Cuirot
2024-07-09 21:07 ` [gentoo-dev] [PATCH 3/8] golang-build.eclass: " James Le Cuirot
2024-07-09 21:07 ` [gentoo-dev] [PATCH 4/8] golang-base.eclass: Drop support for EAPI 5 and 6 James Le Cuirot
2024-07-09 21:07 ` James Le Cuirot [this message]
2024-07-09 21:07 ` [gentoo-dev] [PATCH 6/8] go-env.eclass: Rewrite the go-env_goarch() logic James Le Cuirot
2024-07-09 21:07 ` [gentoo-dev] [PATCH 7/8] go-env.eclass: Add the go-env_goos() helper function James Le Cuirot
2024-07-09 21:07 ` [gentoo-dev] [PATCH 8/8] dev-lang/go: Use go-env.eclass in 1.22.5 and 9999 James Le Cuirot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240709210749.14002-5-chewi@gentoo.org \
--to=chewi@gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
--cc=williamh@gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox