[oe-commits] [openembedded-core] 38/68: tcl: fix sed in do_install()

[git at git.openembedded.org]

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

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

commit 68960cbdf12de8aaff0f792091f839c987cc0aa0
Author: Robert Yang <liezhi.yang at windriver.com>
AuthorDate: 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)
    
    Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/recipes-devtools/tcltk/tcl_8.6.6.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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}

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