1. Forum
  2. Usenet
  3. LINUX.GENTOO.DEV

  • [gentoo-dev] [PATCH 3/4] eclass/golang-vcs-snapshot.eclass: set up comp

    From James Le Cuirot@21:1/5 to All on Sun Nov 19 13:40:01 2023
    From: Thilo Fromm <thilo.alexander@gmail.com>

    This change calls go-env_set_compile_environment in
    golang-vcs-snapshot'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-snapshot.

    Signed-off-by: Thilo Fromm <thilo.alexander@gmail.com>
    Signed-off-by: James Le Cuirot <chewi@gentoo.org>
    ---
    eclass/golang-vcs-snapshot.eclass | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    diff --git a/eclass/golang-vcs-snapshot.eclass b/eclass/golang-vcs-snapshot.eclass
    index 9c199bbbd8c5..d34b8a6e913d 100644
    --- a/eclass/golang-vcs-snapshot.eclass
    +++ b/eclass/golang-vcs-snapshot.eclass
    @@ -52,7 +52,7 @@ esac
    if [[ -z ${_GOLANG_VCS_SNAPSHOT_ECLASS} ]]; then
    _GOLANG_VCS_SNAPSHOT_ECLASS=1

    -inherit golang-base
    +inherit golang-base go-env

    # @ECLASS_VARIABLE: EGO_VENDOR
    # @DESCRIPTION:
    @@ -92,6 +92,7 @@ _golang-vcs-snapshot_dovendor() {
    # @FUNCTION: golang-vcs-snapshot_src_unpack
    # @DESCRIPTION:
    # Extract the first archive from ${A} to the appropriate location for GOPATH. +# Set compile env via go-env.
    golang-vcs-snapshot_src_unpack() {
    local lib vendor_path x
    ego_pn_check
    @@ -117,6 +118,8 @@ golang-vcs-snapshot_src_unpack() {
    fi
    done
    fi
    +
    + go-env_set_compile_environment
    }

    fi
    --
    2.42.1

    --- SoupGate-Win32 v1.05
    * Origin: fsxNet Usenet G