commit:     2009022df92957c33f4a81c28e0039cfb4118a1f
Author:     Viorel Munteanu <ceamac.paragon <AT> gmail <DOT> com>
AuthorDate: Sun Apr 17 07:46:59 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun 30 21:40:15 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2009022d

sys-apps/busybox: Fix installation on split-usr systems

Closes: https://bugs.gentoo.org/825718
Signed-off-by: Viorel Munteanu <ceamac.paragon <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-apps/busybox/busybox-1.34.1-r1.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sys-apps/busybox/busybox-1.34.1-r1.ebuild 
b/sys-apps/busybox/busybox-1.34.1-r1.ebuild
index 702f98008ff3..1d060aa4237c 100644
--- a/sys-apps/busybox/busybox-1.34.1-r1.ebuild
+++ b/sys-apps/busybox/busybox-1.34.1-r1.ebuild
@@ -291,7 +291,9 @@ src_install() {
        rm _install/bin/busybox || die
        # for compatibility, provide /usr/bin/env
        mkdir -p _install/usr/bin || die
-       ln -s /bin/env _install/usr/bin/env || die
+       if [[ ! -e _install/usr/bin/env ]]; then
+               ln -s /bin/env _install/usr/bin/env || die
+       fi
        tar cf busybox-links.tar -C _install . || : #;die
        insinto /usr/share/${PN}
        use make-symlinks && doins busybox-links.tar

Reply via email to