commit: de070b38e760a15e88caea5e917dbee9567520af Author: Mathieu Tortuyaux <mtortuyaux <AT> microsoft <DOT> com> AuthorDate: Thu May 15 12:27:43 2025 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Thu May 15 13:56:21 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de070b38
app-containers/incus: fix cross-compilation issue This has been tested on Flatcar CI with cross-compilation on `amd64` and `arm64`. Signed-off-by: Mathieu Tortuyaux <mtortuyaux <AT> microsoft.com> Part-of: https://github.com/gentoo/gentoo/pull/42095 Closes: https://github.com/gentoo/gentoo/pull/42095 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> app-containers/incus/{incus-6.0.4.ebuild => incus-6.0.4-r1.ebuild} | 5 +++-- app-containers/incus/{incus-6.12.ebuild => incus-6.12-r1.ebuild} | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app-containers/incus/incus-6.0.4.ebuild b/app-containers/incus/incus-6.0.4-r1.ebuild similarity index 97% rename from app-containers/incus/incus-6.0.4.ebuild rename to app-containers/incus/incus-6.0.4-r1.ebuild index 4703fda20578..b128d310292e 100644 --- a/app-containers/incus/incus-6.0.4.ebuild +++ b/app-containers/incus/incus-6.0.4-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit go-module linux-info optfeature systemd toolchain-funcs verify-sig +inherit go-env go-module linux-info optfeature systemd toolchain-funcs verify-sig DESCRIPTION="Modern, secure and powerful system container and virtual machine manager" HOMEPAGE="https://linuxcontainers.org/incus/introduction/ https://github.com/lxc/incus"; @@ -153,7 +153,8 @@ src_test() { src_install() { export GOPATH="${S}/_dist" - if tc-is-cross-compiler ; then + export GOHOSTARCH=$(go-env_goarch "${CBUILD}") + if [[ "${GOARCH}" != "${GOHOSTARCH}" ]]; then local bindir="_dist/bin/linux_${GOARCH}" else local bindir="_dist/bin" diff --git a/app-containers/incus/incus-6.12.ebuild b/app-containers/incus/incus-6.12-r1.ebuild similarity index 97% rename from app-containers/incus/incus-6.12.ebuild rename to app-containers/incus/incus-6.12-r1.ebuild index 92da209e83f8..f0e16b062e41 100644 --- a/app-containers/incus/incus-6.12.ebuild +++ b/app-containers/incus/incus-6.12-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit go-module linux-info optfeature systemd toolchain-funcs verify-sig +inherit go-env go-module linux-info optfeature systemd toolchain-funcs verify-sig DESCRIPTION="Modern, secure and powerful system container and virtual machine manager" HOMEPAGE="https://linuxcontainers.org/incus/introduction/ https://github.com/lxc/incus"; @@ -155,7 +155,8 @@ src_test() { src_install() { export GOPATH="${S}/_dist" - if tc-is-cross-compiler ; then + export GOHOSTARCH=$(go-env_goarch "${CBUILD}") + if [[ "${GOARCH}" != "${GOHOSTARCH}" ]]; then local bindir="_dist/bin/linux_${GOARCH}" else local bindir="_dist/bin"
