[gnome-continuous-yocto/gnomeostree-3.28-rocko: 4733/8267] tcl: fix sed in do_install()



commit 04ce3a37b6a4a53d020feb8ec2c21348aff6a81b
Author: Robert Yang <liezhi yang windriver com>
Date:   Tue Feb 14 22:25:10 2017 -0800

    tcl: fix sed in do_install()
    
    The command:
    sed -i "s+${WORKDIR}+${STAGING_INCDIR}+g" tclConfig.sh
    
    was used for replacing "${WORKDIR}", but it also replaced
    "-L${WORKDIR}", but binconfig.bbclass would replace "-L${WORKDIR}", too,
    which caused incorrect result, use "'${WORKDIR}" to fix the problem.
    
    (From OE-Core rev: 2edfcbf0291c0d39be4a37348696329eba8a41f8)
    
    (From OE-Core rev: 68960cbdf12de8aaff0f792091f839c987cc0aa0)
    
    Signed-off-by: Robert Yang <liezhi yang windriver com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/recipes-devtools/tcltk/tcl_8.6.6.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/meta/recipes-devtools/tcltk/tcl_8.6.6.bb b/meta/recipes-devtools/tcltk/tcl_8.6.6.bb
index c828b38..40cd18f 100644
--- a/meta/recipes-devtools/tcltk/tcl_8.6.6.bb
+++ b/meta/recipes-devtools/tcltk/tcl_8.6.6.bb
@@ -55,7 +55,7 @@ do_install() {
        ln -sf ./tclsh${VER} ${D}${bindir}/tclsh
        ln -sf tclsh8.6 ${D}${bindir}/tclsh${VER}
        sed -i "s;-L${B};-L${STAGING_LIBDIR};g" tclConfig.sh
-       sed -i "s;${WORKDIR};${STAGING_INCDIR};g" tclConfig.sh
+       sed -i "s;'${WORKDIR};'${STAGING_INCDIR};g" tclConfig.sh
        install -d ${D}${bindir_crossscripts}
        install -m 0755 tclConfig.sh ${D}${bindir_crossscripts}
        install -m 0755 tclConfig.sh ${D}${libdir}


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