[OE-core] [PATCH 5/6] tcl: fix sed in do_install()

Robert Yang liezhi.yang at windriver.com
Wed Feb 15 06:25:10 UTC 2017


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.

Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
---
 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}
-- 
2.10.2




More information about the Openembedded-core mailing list