commit: ea08395afda51ef7ffb6291c38266e888ce24c7c Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org> AuthorDate: Sun Nov 13 08:51:03 2022 +0000 Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> CommitDate: Sun Nov 13 08:56:24 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea08395a
dev-lang/gnat-gpl: fix unbundling for x86 Closes: https://bugs.gentoo.org/881165 Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> dev-lang/gnat-gpl/gnat-gpl-2021-r4.ebuild | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dev-lang/gnat-gpl/gnat-gpl-2021-r4.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2021-r4.ebuild index 0ab2e943e258..c30a3ab46902 100644 --- a/dev-lang/gnat-gpl/gnat-gpl-2021-r4.ebuild +++ b/dev-lang/gnat-gpl/gnat-gpl-2021-r4.ebuild @@ -80,15 +80,18 @@ src_prepare() { fi if use bootstrap; then - rm "${WORKDIR}"/${BTSTRP}/libexec/gcc/x86_64-pc-linux-gnu/4.7.4/ld \ + local bundledchost="" + use amd64 && local bundledchost="x86_64" + use x86 && local bundledchost="i686" + rm "${WORKDIR}"/${BTSTRP}/libexec/gcc/${bundledchost}-pc-linux-gnu/4.7.4/ld \ || die ln -s /usr/bin/$CHOST-ld \ - "${WORKDIR}"/${BTSTRP}/libexec/gcc/x86_64-pc-linux-gnu/4.7.4/ld \ + "${WORKDIR}"/${BTSTRP}/libexec/gcc/${bundledchost}-pc-linux-gnu/4.7.4/ld \ || die - rm "${WORKDIR}"/${BTSTRP}/libexec/gcc/x86_64-pc-linux-gnu/4.7.4/as \ + rm "${WORKDIR}"/${BTSTRP}/libexec/gcc/${bundledchost}-pc-linux-gnu/4.7.4/as \ || die ln -s /usr/bin/$CHOST-as \ - "${WORKDIR}"/${BTSTRP}/libexec/gcc/x86_64-pc-linux-gnu/4.7.4/as \ + "${WORKDIR}"/${BTSTRP}/libexec/gcc/${bundledchost}-pc-linux-gnu/4.7.4/as \ || die fi
