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 DB64C15823F for ; Sun, 19 Nov 2023 12:35:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B1F2E2BC068; Sun, 19 Nov 2023 12:34:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 pigeon.gentoo.org (Postfix) with ESMTPS id 4EEFC2BC065 for ; Sun, 19 Nov 2023 12:34:35 +0000 (UTC) From: James Le Cuirot To: gentoo-dev Cc: Thilo Fromm , James Le Cuirot Subject: [gentoo-dev] [PATCH 4/4] eclass/golang-vcs.eclass: set up compile env Date: Sun, 19 Nov 2023 12:30:47 +0000 Message-ID: <20231119123410.17748-5-chewi@gentoo.org> X-Mailer: git-send-email 2.42.1 In-Reply-To: <20231119123410.17748-1-chewi@gentoo.org> References: <20231119123410.17748-1-chewi@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Archives-Salt: 2de5e3cc-aaf0-446a-a361-7d2ec4014837 X-Archives-Hash: 250ce5ab32acf72578c73b5236c66c4d From: Thilo Fromm This change calls go-env_set_compile_environment in golang-vcs's src_unpack to set up a sane compile environment early in the go build process. This un-breaks cross compiling of all golang ebuilds that inherit golang-vcs. Signed-off-by: Thilo Fromm Closes: https://github.com/gentoo/gentoo/pull/33539 Signed-off-by: James Le Cuirot --- eclass/golang-vcs.eclass | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/eclass/golang-vcs.eclass b/eclass/golang-vcs.eclass index 7558db4776cb..6f7a837bc15f 100644 --- a/eclass/golang-vcs.eclass +++ b/eclass/golang-vcs.eclass @@ -20,7 +20,7 @@ esac if [[ -z ${_GOLANG_VCS_ECLASS} ]]; then _GOLANG_VCS_ECLASS=1 -inherit estack golang-base +inherit estack golang-base go-env PROPERTIES+=" live" @@ -63,6 +63,7 @@ PROPERTIES+=" live" # @INTERNAL # @DESCRIPTION: # Create EGO_STORE_DIR if necessary. +# Set compile env via go-env. _golang-vcs_env_setup() { debug-print-function ${FUNCNAME} "$@" @@ -84,6 +85,8 @@ _golang-vcs_env_setup() { mkdir -p "${WORKDIR}/${P}/src" || die "${ECLASS}: unable to create ${WORKDIR}/${P}" return 0 + + go-env_set_compile_environment } # @FUNCTION: _golang-vcs_fetch -- 2.42.1