]> code.ossystems Code Review - openembedded-core.git/commitdiff
tcl: fix sed in do_install()
authorRobert Yang <liezhi.yang@windriver.com>
Wed, 15 Feb 2017 06:25:10 +0000 (22:25 -0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 23 Feb 2017 20:29:16 +0000 (12:29 -0800)
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@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

index c828b38772f5001adfe1ee1921aadeccb10d5605..40cd18fb09aa410c5d50eb39926c35b82f088dd0 100644 (file)
@@ -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}