[oe-commits] [openembedded-core] 10/12: musl: prevent errors if do_install is run more than once

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch rocko
in repository openembedded-core.

commit bdd7bae339096265e887de84f718cbbcd9f7e267
Author: Andre McCurdy <armccurdy at gmail.com>
AuthorDate: Thu Nov 30 12:20:40 2017 -0800

    musl: prevent errors if do_install is run more than once
    
    Signed-off-by: Andre McCurdy <armccurdy at gmail.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
    (cherry picked from commit 3d4c1e0d94175f8c782e94725d365e5e1d1178c1)
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 meta/recipes-core/musl/musl_git.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb
index 932c9a2..db26b4f 100644
--- a/meta/recipes-core/musl/musl_git.bb
+++ b/meta/recipes-core/musl/musl_git.bb
@@ -57,10 +57,11 @@ do_install() {
 	oe_runmake install DESTDIR='${D}'
 
 	install -d ${D}${bindir}
+	rm -f ${D}${bindir}/ldd
 	lnr ${D}${libdir}/libc.so ${D}${bindir}/ldd
 	for l in crypt dl m pthread resolv rt util xnet
 	do
-		ln -s libc.so ${D}${libdir}/lib$l.so
+		ln -sf libc.so ${D}${libdir}/lib$l.so
 	done
 }
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.