commit: f3faf2fcadfad9548143381d664217296c4ecfc2 Author: Mathieu Tortuyaux <mtortuyaux <AT> microsoft <DOT> com> AuthorDate: Fri Apr 19 13:10:17 2024 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Mon Apr 22 17:02:30 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3faf2fc
app-containers/incus: fix cross compilation issue on 6.0.0 * explicitly call the *src_unpack * set Go installation PATH if cross compilation is detected Signed-off-by: Mathieu Tortuyaux <mtortuyaux <AT> microsoft.com> Closes: https://github.com/gentoo/gentoo/pull/36323 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> .../{incus-6.0.0.ebuild => incus-6.0.0-r1.ebuild} | 24 ++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/app-containers/incus/incus-6.0.0.ebuild b/app-containers/incus/incus-6.0.0-r1.ebuild similarity index 89% rename from app-containers/incus/incus-6.0.0.ebuild rename to app-containers/incus/incus-6.0.0-r1.ebuild index 1c2b2fa462e1..87af2e5f9154 100644 --- a/app-containers/incus/incus-6.0.0.ebuild +++ b/app-containers/incus/incus-6.0.0-r1.ebuild @@ -83,6 +83,11 @@ RESTRICT="test" GOPATH="${S}/_dist" +src_unpack() { + verify-sig_src_unpack + go-module_src_unpack +} + src_prepare() { export GOPATH="${S}/_dist" @@ -147,7 +152,12 @@ src_test() { src_install() { export GOPATH="${S}/_dist" - local bindir="_dist/bin" + + if [[ "${GOARCH}" != "amd64" ]]; then + local bindir="_dist/bin/linux_${GOARCH}" + else + local bindir="_dist/bin" + fi newsbin "${FILESDIR}"/incus-startup-0.4.sh incus-startup @@ -176,11 +186,13 @@ src_install() { systemd_newunit "${FILESDIR}"/incus-user-0.4.service incus-user.service systemd_newunit "${FILESDIR}"/incus-user-0.4.socket incus-user.socket - # Generate and install shell completion files. - mkdir -p "${D}"/usr/share/{bash-completion/completions/,fish/vendor_completions.d/,zsh/site-functions/} || die - "${bindir}"/incus completion bash > "${D}"/usr/share/bash-completion/completions/incus || die - "${bindir}"/incus completion fish > "${D}"/usr/share/fish/vendor_completions.d/incus.fish || die - "${bindir}"/incus completion zsh > "${D}"/usr/share/zsh/site-functions/_incus || die + if ! tc-is-cross-compiler; then + # Generate and install shell completion files. + mkdir -p "${D}"/usr/share/{bash-completion/completions/,fish/vendor_completions.d/,zsh/site-functions/} || die + "${bindir}"/incus completion bash > "${D}"/usr/share/bash-completion/completions/incus || die + "${bindir}"/incus completion fish > "${D}"/usr/share/fish/vendor_completions.d/incus.fish || die + "${bindir}"/incus completion zsh > "${D}"/usr/share/zsh/site-functions/_incus || die + fi dodoc AUTHORS dodoc -r doc/*
