[gnome-continuous-yocto/gnomeostree-3.28-rocko: 133/218] musl: prevent errors if do_install is run more than once



commit 574a45c60644eace1523a4b21083f334aa84ad2d
Author: Andre McCurdy <armccurdy gmail com>
Date:   Thu Nov 30 12:20:40 2017 -0800

    musl: prevent errors if do_install is run more than once
    
    (From OE-Core rev: bdd7bae339096265e887de84f718cbbcd9f7e267)
    
    Signed-off-by: Andre McCurdy <armccurdy gmail com>
    Signed-off-by: Ross Burton <ross burton intel com>
    (cherry picked from commit 3d4c1e0d94175f8c782e94725d365e5e1d1178c1)
    Signed-off-by: Armin Kuster <akuster808 gmail com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/recipes-core/musl/musl_git.bb |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
---
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
 }
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]